John Koleszar [Tue, 26 Oct 2010 13:37:44 +0000 (09:37 -0400)]
arm: remove duplicate functions
These functions were true duplicates of functions present in the
generic code. This fixes some of the link errors when building
with --enable-shared --enable-pic.
Change-Id: Idff26599d510d954e439207883607ad6b74df20c
Jim Bankoski [Tue, 26 Oct 2010 11:34:57 +0000 (07:34 -0400)]
Merge commit 'refs/changes/09/809/1' of https://review.webmproject.org/p/libvpx
John Koleszar [Tue, 26 Oct 2010 02:59:23 +0000 (22:59 -0400)]
Merge WebM input/output branch
Change-Id: I83a6f18d2314e5d97759b4ae49afaa52fd8b3c44
John Koleszar [Fri, 22 Oct 2010 18:57:02 +0000 (14:57 -0400)]
vpxenc: warn against webm output to pipes
The WebM writer requires a seekable stream.
Change-Id: I192e00706a0685362d41b8d2faf80add63d564b9
John Koleszar [Fri, 22 Oct 2010 18:48:21 +0000 (14:48 -0400)]
vpxenc: specify output file with -o
Requiring the output file to be specified with the -o option opens up
the possibility of supporting multiple input files in the future.
Change-Id: I14c9b75e9b21184b47081e1ccf30cf4c91315964
John Koleszar [Fri, 22 Oct 2010 03:40:42 +0000 (20:40 -0700)]
vpxdec: rework default output parameters
This patch reworks the default behavior of the tool to output Y4M
instead of writing individual raw frames. The relevant controls are
now:
--yv12, --i420 - These options change the output format to be
raw planar data. The output will be Y4M unless
one of these options is specified.
--flipuv - Swaps the chroma planes. Works with Y4M output.
-o, --output - Sets the output filename. Defaults to stdout if
not specified. Supports escape character
expansion for frame width (%w) height (%h) and
sequence number (%1..%9). The --prefix option
has been removed in favor of this escape
expansion.
Since the output defaults to stdout if -o is not specified, an
error will be thrown if stdout is not connected to a pipe. This
can be overridden by specifying '-o -'.
Change-Id: I94e42c57ca75721fdd57a6129e79bcdb2afe5d4d
John Koleszar [Fri, 22 Oct 2010 03:35:12 +0000 (20:35 -0700)]
vpxdec: replace --quiet with --verbose
Be quiet by default, to play nicer with scripts.
Change-Id: I68f6c88411fd5487566f268fb73b4e55ae64410c
John Koleszar [Thu, 21 Oct 2010 21:28:34 +0000 (17:28 -0400)]
vpxdec: use the same output for --progress and --summary
Update the timing information in-place for the --progress
option.
Change-Id: I8efea57050db72963c0bc5c994425e7e692d1502
John Koleszar [Thu, 21 Oct 2010 20:53:52 +0000 (16:53 -0400)]
usage: fix horizontal alignment of options
When showing the command usage information for vpxenc and vpxdec,
options with both a short and long version that do not take an
argument were not properly aligned.
Change-Id: I8d65b5ab85bcb5a5dc8bc0d4b293b5189d56dedb
John Koleszar [Thu, 21 Oct 2010 20:52:14 +0000 (16:52 -0400)]
vpxenc: change --framerate to --fps
Saves a little typing. FPS is a well known abbreviation.
Change-Id: I53730ea36afb9309732eb1c72c52d824d5365fec
John Koleszar [Thu, 21 Oct 2010 20:23:20 +0000 (16:23 -0400)]
vpxenc: output webm by default
WebM should be preferred to IVF output, since it has wider tool support.
Change-Id: I5ac3d5cb68722e6c8af917cdba32ac01dd5e0ea2
John Koleszar [Thu, 21 Oct 2010 19:02:10 +0000 (15:02 -0400)]
rename ivf{enc,dec} to vpx{enc,dec}
The new WebM output support should be preferred to IVF, but we can't
change the default behavior of the ivf* tools. There are a few other
default behaviors for these tools that are counterintuitive for
historical reasons, and changing the binary name provides the
opportunity to clean those up as well. This patch takes the first
step by renaming the binaries.
Change-Id: I647008ae37cc352dd27ec1da7ed13489e0609b24
John Koleszar [Wed, 20 Oct 2010 16:05:48 +0000 (12:05 -0400)]
ivfenc: webm output support
This patch adds the --webm option, to allow the creation of WebM streams
without having to remux ivf into webm.
Change-Id: Ief93c114a6913c55a04cf51bce38f594372d0ad0
John Koleszar [Wed, 20 Oct 2010 15:06:48 +0000 (11:06 -0400)]
Import webmquicktime webm writer
Initial import of the libmkv directory from the webmquicktime[1]
project, at commit fedbda1.
[1]: git://review.webmproject.org/webmquicktime.git
commit
fedbda18de899ff94855cb334de7e471036fbf1d
Change-Id: I1564a0ebfa72293fc296ee02178196530dfd90e4
Frank Galligan [Wed, 6 Oct 2010 16:51:00 +0000 (12:51 -0400)]
Fixed the timebase parameter of ivfenc.
Ivfenc will use timebase if it is set. If it is not set ivfenc will
still double the timebase so altref frames will have a unique pts.
Patch Set #3: Use integer math to generate source pts. Added a
framerate parameter. Increased the default timebase to milliseconds to
remove the *2 everywhere.
Change-Id: I8d25b5b2cb26deef7eb72d74b5f76c98cafaf4db
John Koleszar [Wed, 20 Oct 2010 14:49:12 +0000 (10:49 -0400)]
ivfdec: support y4m output from raw input
The width and height needed to write the Y4M header can be found by
probing the stream with vpx_codec_peek_stream_info(). This also
has the consequence of supporting multiple codecs from raw files
with automatic detections, should we add additional codecs in the
future.
Change-Id: I7522a8f4c7577b6ed9876d744c59cd86d30c6049
John Koleszar [Tue, 19 Oct 2010 21:20:17 +0000 (17:20 -0400)]
ivfdec: webm reader support
This patch enables ivfdec to decode WebM files. WebM demuxing is
provided by the Matthew Gregan's Nestegg library.
This patch also makes minor changes to the timebase->framerate
handling when doing Y4M output. For WebM files, the framerate is
guessed by looking at the first second of video. For IVF files,
the timebase=1/(2*fps) hack is still in place, but is only used
if the timebase denominator is less than 1000. This is in anticipation
of change I8d25b5b, which introduces the distinction between
framerate and timebase to ivfenc. In the case of high resolution
timebases, like 100ns, we would have to guess the framerate
like we do for WebM, but since WebM support in ivfenc will
deprecate IVF output, we just assume 30fps rather than writing the
lookahead code.
Change-Id: I1dd8600f13bf6071533d2816f005da9ede4f60a2
Fritz Koenig [Mon, 25 Oct 2010 22:40:22 +0000 (15:40 -0700)]
Merge "Debug option for drawing motion vectors."
Fritz Koenig [Fri, 22 Oct 2010 22:41:06 +0000 (15:41 -0700)]
Debug option for drawing motion vectors.
Postproc level that uses Bresenham's line algorithm
to draw motion vectors onto the postproc buffer.
Change-Id: I34c7daa324f2bdfee71e84fcb1c50b90fa06f6fb
Johann [Mon, 25 Oct 2010 20:26:55 +0000 (13:26 -0700)]
Merge "quiet compiler"
John Koleszar [Mon, 25 Oct 2010 20:23:19 +0000 (13:23 -0700)]
Merge "Remove legacy release.sh script"
Aaron Watry [Thu, 30 Sep 2010 19:36:00 +0000 (15:36 -0400)]
Add sparc-solaris-gcc as a build target.
Solaris 10 requires -lposix4 to build successfully on gcc. I only have a
Sparc machine to test with on Solaris 10, but this change leaves
OpenSolaris x86 in a usable state w/ gnu-generic.
I am of the belief that this change should fix Solaris 10 on Sparc, but
will leave other Solaris architectures as is. If someone has an x86
Solaris 10 machine to test on, they may add x86-solaris-gcc to
libvpx/configure and give it a go.
Change-Id: I17a282028bb4d3e9fd8764159f95665160f7b62a
Martin Ettl [Mon, 25 Oct 2010 17:14:11 +0000 (13:14 -0400)]
Fix leaked file descriptor with ENTROPY_STATS
cppcheck found a leaked file descriptor in the debugging code
enabled by defining ENTROPY_STATS. Fixes issue #60.
Change-Id: I0c1d0669cb94d44fed77860f97b82763be06b7cb
John Koleszar [Mon, 25 Oct 2010 14:28:45 +0000 (10:28 -0400)]
NASM: trailing slash for ASFLAGS includes
Fix out-of-tree builds using NASM. NASM expects its include paths to
have a trailing slash. These aren't used used when doing in-tree builds
(./configure)
Change-Id: I38d469d15acb1b7e65733a2e5ca8c9d86fa4ad86
Johann [Mon, 25 Oct 2010 14:07:35 +0000 (10:07 -0400)]
quiet compiler
clean up compiler warnings, man in the yellow hat warnings, and start to
remove unused #includes
Change-Id: I6267e98d9b3024b6fb1ef2732b29067a33cb96f6
Johann [Mon, 18 Oct 2010 18:57:40 +0000 (14:57 -0400)]
reuse common loopfilter code
there were four versions for the regular and
macroblock loopfilters:
horizontal [y|uv]
vertical [y|uv]
this moves all the common code into 2 functions:
vp8_loop_filter_neon
vp8_mbloop_filter_neon
this provides no gain in performance. there's a bit
of jitter, but it trends down ~0.25-0.5%. however,
this is a huge gain maintenance. also, there is the
potential to drop some stack usage in the macroblock
loopfilter.
Change-Id: I91506f07d2f449631ff67ad6f1b3f3be63b81a92
Timothy B. Terriberry [Wed, 20 Oct 2010 22:39:11 +0000 (15:39 -0700)]
Add runtime CPU detection support for ARM.
The primary goal is to allow a binary to be built which supports
NEON, but can fall back to non-NEON routines, since some Android
devices do not have NEON, even if they are otherwise ARMv7 (e.g.,
Tegra).
The configure-generated flags HAVE_ARMV7, etc., are used to decide
which versions of each function to build, and when
CONFIG_RUNTIME_CPU_DETECT is enabled, the correct version is chosen
at run time.
In order for this to work, the CFLAGS must be set to something
appropriate (e.g., without -mfpu=neon for ARMv7, and with
appropriate -march and -mcpu for even earlier configurations), or
the native C code will not be able to run.
The ASFLAGS must remain set for the most advanced instruction set
required at build time, since the ARM assembler will refuse to emit
them otherwise.
I have not attempted to make any changes to configure to do this
automatically.
Doing so will probably require the addition of new configure options.
Many of the hooks for RTCD on ARM were already there, but a lot of
the code had bit-rotted, and a good deal of the ARM-specific code
is not integrated into the RTCD structs at all.
I did not try to resolve the latter, merely to add the minimal amount
of protection around them to allow RTCD to work.
Those functions that were called based on an ifdef at the calling
site were expanded to check the RTCD flags at that site, but they
should be added to an RTCD struct somewhere in the future.
The functions invoked with global function pointers still are, but
these should be moved into an RTCD struct for thread safety (I
believe every platform currently supported has atomic pointer
stores, but this is not guaranteed).
The encoder's boolhuff functions did not even have _c and armv7
suffixes, and the correct version was resolved at link time.
The token packing functions did have appropriate suffixes, but the
version was selected with a define, with no associated RTCD struct.
However, for both of these, the only armv7 instruction they actually
used was rbit, and this was completely superfluous, so I reworked
them to avoid it.
The only non-ARMv4 instruction remaining in them is clz, which is
ARMv5 (not even ARMv5TE is required).
Considering that there are no ARM-specific configs which are not at
least ARMv5TE, I did not try to detect these at runtime, and simply
enable them for ARMv5 and above.
Finally, the NEON register saving code was completely non-reentrant,
since it saved the registers to a global, static variable.
I moved the storage for this onto the stack.
A single binary built with this code was tested on an ARM11 (ARMv6)
and a Cortex A8 (ARMv7 w/NEON), for both the encoder and decoder,
and produced identical output, while using the correct accelerated
functions on each.
I did not test on any earlier processors.
Change-Id: I45cbd63a614f4554c3b325c45d46c0806f009eaa
Johann [Wed, 20 Oct 2010 20:27:33 +0000 (16:27 -0400)]
isolate new temporal filtering code
onyx_if is getting pretty big. split out the temporal code to make it
easier to look at.
Change-Id: I207c3a94c90e91b32e3ea5e1836a53b7a990fabd
John Koleszar [Fri, 22 Oct 2010 15:54:07 +0000 (11:54 -0400)]
Merge "Improve handling of invalid frames."
Change-Id: Icef5226a70260607c190126c1c0cc28b796e759c
Timothy B. Terriberry [Tue, 19 Oct 2010 22:40:46 +0000 (15:40 -0700)]
Improve handling of invalid frames.
The code was not checking for frame sizes smaller than 3 bytes, and the
partition size checks might have failed if the input buffer was within
16MB of the top of the heap.
In addition, the reference count on the current frame buffer was not
being decremented on error, so after a small number of errors, no new
frame buffer could be found and it would run off the list of them.
Change-Id: I0c60dba6adb1e2a29df39754f72a56ab6c776b46
Timothy B. Terriberry [Fri, 22 Oct 2010 00:04:30 +0000 (17:04 -0700)]
Convert [4][4] matrices to [16] arrays.
Most of the code that actually uses these matrices indexes them as
if they were a single contiguous array, and coverity produces
reports about the resulting accesses that overflow the static
bounds of the first row.
This is perfectly legal in C, but converting them to actual [16]
arrays should eliminate the report, and removes a good deal of
extraneous indexing and address operators from the code.
Change-Id: Ibda479e2232b3e51f9edf3b355b8640520fdbf23
Frank Galligan [Tue, 5 Oct 2010 21:46:37 +0000 (17:46 -0400)]
Change altref times to preceding pts+1.
Change the pts of the altref frame to be as close as possible to the
pts of the preceding frame and still be strictly increasing.
Change-Id: Iae3033a4c89ae5a9d0e5c4198e9196e5f3ee57c7
John Koleszar [Thu, 21 Oct 2010 18:09:02 +0000 (11:09 -0700)]
Merge "Move firstpass motion map to stats packet"
John Koleszar [Thu, 14 Oct 2010 20:40:12 +0000 (16:40 -0400)]
Move firstpass motion map to stats packet
The first implementation of the firstpass motion map for motion
compensated temporal filtering created a file, fpmotionmap.stt,
in the current working directory. This was not safe for multiple
encoder instances. This patch merges this data into the first pass
stats packet interface, so that it is handled like the other
(numerical) firstpass stats.
The new stats packet is defined as follows:
Numerical Stats (16 doubles) -- 128 bytes
Motion Map -- 1 byte / Macroblock
Padding -- to align packet to 8 bytes
The fpmotionmap.stt file can still be generated for debugging
purposes in the same way that the textual version of the stats
are available (defining OUTPUT_FPF in firstpass.c)
Change-Id: I083ffbfd95e7d6a42bb4039ba0e81f678c8183ca
Yunqing Wang [Thu, 21 Oct 2010 17:42:24 +0000 (13:42 -0400)]
Add MMWORD PTR/XMMWORD PTR in subtract_sse2.asm
Change-Id: Ia649b500ef020225d8bbf611799d0f47658dc2ac
Yunqing Wang [Thu, 21 Oct 2010 17:31:22 +0000 (10:31 -0700)]
Merge "Rewrite vp8_short_walsh4x4_sse2()"
Yunqing Wang [Thu, 21 Oct 2010 17:30:27 +0000 (10:30 -0700)]
Merge "Add SSE2 subtract functions"
Yunqing Wang [Thu, 21 Oct 2010 14:26:50 +0000 (10:26 -0400)]
Rewrite vp8_short_walsh4x4_sse2()
This rewriting reflects changes made in commit "Improve the
accuracy of forward walsh-hadamard transform". Since this function
is not called much, only a small encoder performance gain (~0.5% )
is seen.
Change-Id: Ie9df58a43028a11fd5b115c4bbe3141f7596578b
John Koleszar [Tue, 19 Oct 2010 18:40:07 +0000 (14:40 -0400)]
Import nestegg webm/mkv parser
Initial import of nestegg[1] parser lib, at commit 0d51131.
[1]: http://github.com/kinetiknz/nestegg
commit
0d51131519a1014660b5e111e28a78785d76600f
Change-Id: I191d388b7e5140ef96624511ccdd65d0e183076d
John Koleszar [Wed, 20 Oct 2010 03:20:31 +0000 (20:20 -0700)]
Merge "Update arnr strength range form 1-6 to 0-6."
Frank Galligan [Tue, 5 Oct 2010 01:12:22 +0000 (21:12 -0400)]
Update arnr strength range form 1-6 to 0-6.
Change-Id: I8eb49c56f7509f0a8074d440e8345b9e3344b85b
Yaowu Xu [Tue, 19 Oct 2010 23:23:31 +0000 (16:23 -0700)]
Merge "fixed a typo that mis-used Y plane stride for UV blocks."
Yaowu Xu [Tue, 19 Oct 2010 15:11:52 +0000 (08:11 -0700)]
Merge "change to make use of more trellis quantization"
Yunqing Wang [Mon, 18 Oct 2010 18:15:15 +0000 (14:15 -0400)]
Add SSE2 subtract functions
Instead of doing 8-bit data unpack and 16-bit subtraction, use
psubb to do 16 8-bit subtractions and pcmpgtb to preserve the
sign information. This does not bring noticable gain since
these functions are not called frequently.
Change-Id: I90a0dfaa3db9d422e4ada324076596ffb178548e
Johann [Mon, 18 Oct 2010 17:23:39 +0000 (13:23 -0400)]
copy compiler warning fixes
generic version got fixed, but not the arm version. fixes:
vp8/encoder/arm/mcomp_arm.c: In function 'vp8_full_search_sadx3':
vp8/encoder/arm/mcomp_arm.c:1208: warning: pointer targets in passing
argument 5 of 'fn_ptr->sdx3f' differ in signedness
vp8/encoder/arm/mcomp_arm.c:1208: note: expected 'unsigned int *' but
argument is of type 'int *'
and another unsigned change to keep the files similar
Change-Id: I1b6255dc3a03b90394a791ee0d15d8167d9454db
Johann [Fri, 15 Oct 2010 19:25:19 +0000 (15:25 -0400)]
remove dead code
vp8_diamond_search_sadx4 isn't used in arm because there is no
corrosponding sdx4df as in x86. rather than keep it in sync with
../mcomp.c, delete it
vp8_hex_search had the original, more readable/understandable code if`d
out. it's also available in ../mcomp.c, so remove the dead copy
Change-Id: Ia42aa6e23b3a2e88040f467280befec091ec080e
Yaowu Xu [Fri, 15 Oct 2010 01:58:34 +0000 (18:58 -0700)]
change to make use of more trellis quantization
when a subsequent frame is encoded as an alt reference frame, it is
unlikely that any mb in current frame will be used as reference for
future frames, so we can enable quantization optimization even when
the RD constant is slightly rate-biased. The change has an overall
benefit between 0.1% to 0.2% bit savings on the test sets based on
vpxssim scores.
Change-Id: I9aa7bc5cd573ea84e3ee655d2834c18c4460ceea
Jim Bankoski [Thu, 14 Oct 2010 20:19:06 +0000 (16:19 -0400)]
safety check to avoid divide by 0s
Yunqing Wang [Thu, 14 Oct 2010 19:20:25 +0000 (12:20 -0700)]
Merge "Fix one gcc compiler warning"
Yunqing Wang [Thu, 14 Oct 2010 18:25:03 +0000 (14:25 -0400)]
Fix one gcc compiler warning
../libvpx/vp8/encoder/bitstream.c: In function ‘pack_inter_mode_mvs’:
../libvpx/vp8/encoder/bitstream.c:1026: warning: array subscript has type ‘char’
Change-Id: Ic77491e0a172fa1821e5b3e914d0dc41fe87c00f
Yunqing Wang [Thu, 14 Oct 2010 18:29:24 +0000 (11:29 -0700)]
Merge "Improve bounds checking in vp8_diamond_search_sadx4()"
Yunqing Wang [Thu, 14 Oct 2010 15:06:37 +0000 (11:06 -0400)]
Improve bounds checking in vp8_diamond_search_sadx4()
In order to know if all 4/8 neighbor points are within the bounds,
4 bounds checking are enough instead of checking 4 bounds for
each points (16/32 checkings). This improvement reduces cost of
vp8_diamond_search_sadx4() by 30%, and gives encoder a 1.5%
performance gain (test options: 1 pass, good, speed=4).
Change-Id: Ie8da29d18a6ecfc9829e74ac02f6fa70e042331a
Fritz Koenig [Thu, 14 Oct 2010 00:08:13 +0000 (17:08 -0700)]
Fix compiler warning about vp8_fast_quantize_b_impl_ssse2.
Typo had function defined as _ssse2 and prototyped as _sse2.
Change-Id: If9f19da1a83cff40774a90cf936d601c0bf1b7fe
Fritz Koenig [Wed, 13 Oct 2010 23:57:57 +0000 (16:57 -0700)]
Correct QWORD usage in assembly files
QWORD was being undefined because it was being used
incorrectly.
Change-Id: I3610cefa3d6f0da4054316760f78b9694cde3876
Fritz Koenig [Tue, 12 Oct 2010 21:55:31 +0000 (14:55 -0700)]
Add processor dectection for x86.
Use cpuid to check the vendor string against known
architectures.
Change-Id: I3fbd7f73638d71857a0c4a44a6275eb295fb4cef
Fritz Koenig [Tue, 12 Oct 2010 16:42:03 +0000 (09:42 -0700)]
GCC inline restrictions were not adequate.
=r was not restrictive enough and the compiler was not returning
ebx correctly.
Change-Id: I7606e384067bd5fb69189802f1ff64ccc5aa02d6
John Koleszar [Thu, 7 Oct 2010 05:39:16 +0000 (22:39 -0700)]
Centralize mb skip state calculation
This patch moves the scattered updates to the mb skip state
(mode_info_context->mbmi.mb_skip_coeff) to vp8_tokenize_mb. Recent
changes to the quantizer exposed a bug where if a macroblock
could be coded as a skip but isn't, the encoder would run the
loopfilter but the decoder wouldn't, causing a reference buffer
mismatch.
The loopfilter is controlled by a flag called dc_diff. The decoder
looks at the number of decoded coefficients when setting this flag.
The encoder sets this flag based on the skip state, since any
skippable macroblock should be transmitted as a skip. The coefficient
optimization pass (vp8_optimize_b()) could change the coefficients
such that a block that was not a skip becomes one. The encoder was
not updating the skip state in this situation for intra coded blocks.
The underlying issue predates it, but this bug was recently triggered
by enabling trellis quantization on the Y2 block in commit dcd29e3,
and by changing the quantizer range control in commit 305be4e.
Change-Id: I5cce5da0dbc2d22f7d79ee48149f01e868a64802
John Koleszar [Tue, 12 Oct 2010 12:44:20 +0000 (05:44 -0700)]
Merge "Add const qualifiers to variance/SAD functions."
Timothy B. Terriberry [Mon, 11 Oct 2010 21:01:23 +0000 (14:01 -0700)]
Add const qualifiers to variance/SAD functions.
These functions should never change their input, and there's no
reason not to declare that.
This allows them to be passed static const data.
Change-Id: Ia49fe4b01e80e9afcb24b4844817694d4da5995c
John Koleszar [Tue, 12 Oct 2010 12:34:30 +0000 (05:34 -0700)]
Merge "Move vp8_strict_quantize_b inside EXACT_QUANT #define."
John Koleszar [Tue, 12 Oct 2010 12:33:22 +0000 (05:33 -0700)]
Merge "Remove INTRARDOPT #define and intra_rd_opt option."
Timothy B. Terriberry [Mon, 11 Oct 2010 20:49:52 +0000 (13:49 -0700)]
Move vp8_strict_quantize_b inside EXACT_QUANT #define.
There is currently no inexact version of this function, so do not
even compile it without EXACT_QUANT.
This will prevent someone from inadvertently trying to use it without
the proper EXACT_QUANT setup.
Change-Id: Ia13491e0128afb281c05c9222ee5987101e4010d
Timothy B. Terriberry [Mon, 11 Oct 2010 16:34:48 +0000 (09:34 -0700)]
Remove INTRARDOPT #define and intra_rd_opt option.
This is just eliminating some cruft.
Although a number of variables are declared only when INTRARDOPT
is defined, they are used elsewhere without that protection, and
no longer just for intra RDO.
The intra_rd_opt flag was hard-coded to 1 and never checked.
Change-Id: I83a81554ecee8053e7b4ccd8aa04e18fa60f8e4f
Scott LaVarnway [Mon, 11 Oct 2010 16:34:48 +0000 (09:34 -0700)]
Merge "Added vp8_fast_quantize_b_sse2"
John Koleszar [Mon, 11 Oct 2010 14:43:35 +0000 (07:43 -0700)]
Merge "Remove ivfenc usage message leading underscores"
John Koleszar [Mon, 11 Oct 2010 13:41:14 +0000 (09:41 -0400)]
Remove ivfenc usage message leading underscores
An earlier automatic transform changed eg '\nOptions' to '\n_options'
which is incorrect in these printfs. Fix these.
Change-Id: I7e0f37931ef82b79fadddd7058ce0df5572e2ca1
Johann [Thu, 7 Oct 2010 18:13:36 +0000 (14:13 -0400)]
configure is not in src
one comment in the README said the configure script was in src.
it's not. pointed out by Aaron Sherman
Change-Id: Ife0b53e096856d46669a99eefd71ac23d0351f65
Yunqing Wang [Thu, 7 Oct 2010 16:08:08 +0000 (12:08 -0400)]
Remove unused file in encoder
Remove vp8/encoder/x86/csystemdependent.c
Change-Id: I7c590dcd07b68704d463a1452f62f29ffb1402f4
Scott LaVarnway [Thu, 7 Oct 2010 15:43:19 +0000 (11:43 -0400)]
Added vp8_fast_quantize_b_sse2
Moved vp8_fast_quantize_b_sse from quantize_mmx.asm into
quantize_sse2.asm and renamed. Updated the assembly code to
match the C version.
Change-Id: I1766d9e1ca60e173f65badc0ca0c160c2b51b200
Yaowu Xu [Wed, 6 Oct 2010 20:28:36 +0000 (13:28 -0700)]
optimize fast_quantizer c version
As the zbin and rounding constants are normalized, rounding effectively
does the zbinning, therefore the zbin operation can be removed. In
addition, the memset on the two arrays are no longer necessary.
Change-Id: If39c353c42d7e052296cb65322e5218810b5cc4c
Jan Kratochvil [Tue, 5 Oct 2010 17:15:08 +0000 (19:15 +0200)]
nasm: add configure support
yasm has to be preferred as currently nasm produces marginally less
efficient code (longer opcodes). Filed for nasm as:
https://sourceforge.net/tracker/?func=detail&atid=106208&aid=3037462&group_id=6208
OTOH package should be built always the same, no matter which additional
packages are / are not present on the system. As the package should be
built with nasm (as yasm may not be available) we should not use yasm
even if it is possibly available.
nasm >= approx. 2.09 is required for the nasm compilation as the former
versions had a section alignment bug.
Provide nasm compatibility. No binary change by this patch with yasm on
{x86_64,i686}-fedora13-linux-gnu. Few longer opcodes with nasm on
{x86_64,i686}-fedora13-linux-gnu have been checked as safe.
Change-Id: Icb0fe39c64bbcc3bcd7972e392fd03f3273340df
Paul Wilkins [Tue, 5 Oct 2010 13:58:24 +0000 (06:58 -0700)]
Merge "Tune effect of motion on KF/GF boost in two pass;"
Jan Kratochvil [Mon, 4 Oct 2010 21:20:38 +0000 (23:20 +0200)]
nasm: movhps compatibility QWORD->MMWORD
Filed for nasm as:
https://sourceforge.net/tracker/?func=detail&atid=106208&aid=3081103&group_id=6208
nasm just does not accept any size parameter for movhps:
1.asm:2: error: mismatch in operand sizes
Some parts of libvpx already use MMWORD for movhps and MMWORD is
defined-out so it is compatible both with yasm and nasm.
Provide nasm compatibility. No binary change by this patch with yasm on
{x86_64,i686}-fedora13-linux-gnu.
Change-Id: I4008a317ca87ec07c9ada958fcdc10a0cb589bbc
Jan Kratochvil [Sat, 31 Jul 2010 15:12:32 +0000 (17:12 +0200)]
nasm: avoid relative include paths
nasm does not automatically assume the source's directory also for its
include files.
Provide nasm compatibility. No binary change by this patch with yasm on
{x86_64,i686}-fedora13-linux-gnu. Few longer opcodes with nasm on
{x86_64,i686}-fedora13-linux-gnu have been checked as safe.
Change-Id: I386efa0cca5d401193416c11bd7363a283541645
Jan Kratochvil [Mon, 4 Oct 2010 21:18:58 +0000 (23:18 +0200)]
nasm: address labels 'rel label' vice 'wrt rip'
nasm does not support `label wrt rip', it requires `rel label'. It is
still fully compatible with yasm.
Provide nasm compatibility. No binary change by this patch with yasm on
{x86_64,i686}-fedora13-linux-gnu. Few longer opcodes with nasm on
{x86_64,i686}-fedora13-linux-gnu have been checked as safe.
Change-Id: I488773a4e930a56e43b0cc72d867ee5291215f50
Jan Kratochvil [Mon, 4 Oct 2010 21:19:33 +0000 (23:19 +0200)]
nasm: match instruction length (movd/movq) to parameters
nasm requires the instruction length (movd/movq) to match to its
parameters. I find it more clear to really use 64bit instructions when
we use 64bit registers in the assembly.
Provide nasm compatibility. No binary change by this patch with yasm on
{x86_64,i686}-fedora13-linux-gnu. Few longer opcodes with nasm on
{x86_64,i686}-fedora13-linux-gnu have been checked as safe.
Change-Id: Id9b1a5cdfb1bc05697e523c317a296df43d42a91
Yaowu Xu [Mon, 4 Oct 2010 17:58:42 +0000 (10:58 -0700)]
fixed a typo that mis-used Y plane stride for UV blocks.
Raised by Lei Yang, the Y plane stride was used for UV blocks.
This is clearly a typo. But as the comments in the code suggested
that this port of code has not been used yet, so the typo should
not have created any damage yet.
Change-Id: Iea895edc17469a51c803a8cc6d0fce65a1a7fc2f
Yaowu Xu [Mon, 4 Oct 2010 17:41:20 +0000 (10:41 -0700)]
Merge "enable trellis quantization for 2nd order blocks"
Paul Wilkins [Sat, 2 Oct 2010 16:31:46 +0000 (17:31 +0100)]
Tune effect of motion on KF/GF boost in two pass;
This code adjust the impact of the amount and speed of motion
on GF and KF boost.
Sections with lots of slow motion will tend to have a
somewhat bigger boost and sections with fast motion may
have less.
There is a knock on effect to the selection of the active
quantizer range.
This will likely require further tuning but helps with a couple
of particularly bad edge cases.
Change-Id: Ic2449cda7305672b69acf42fc0a845b77ac98d40
Yaowu Xu [Fri, 1 Oct 2010 03:41:37 +0000 (20:41 -0700)]
enable trellis quantization for 2nd order blocks
Experimented with different value for Y2_RD_MULT ranging f[1, 32],
without adapting the value to MB coding mode/frame type/Q value,
4 works out best among all values, providing overall 0.1% coding
gain on the test set.
Change-Id: I6b2583a8aa5db5e7e5c65c646301909c0c58f876
Johann [Fri, 1 Oct 2010 13:18:53 +0000 (06:18 -0700)]
Merge "Fix valgrind errors in the NEON loop filters."
Adrian Grange [Fri, 1 Oct 2010 09:14:01 +0000 (10:14 +0100)]
Made temporal filter default to use centered mode
If temporal filtering is enabled but a filter type is not specified
centered filter mode is used by default.
Change-Id: I87306f267c1390074c806c506a69b4ba914d92a2
Timothy B. Terriberry [Fri, 1 Oct 2010 03:40:45 +0000 (20:40 -0700)]
Fix valgrind errors in the NEON loop filters.
Like the ARMv6 code, these functions were accessing values below
the stack pointer, which can be corrupted by signal delivery at
any time.
John Koleszar [Thu, 30 Sep 2010 17:26:31 +0000 (10:26 -0700)]
Merge "Rename mode_ref_lf_test_function"
John Koleszar [Thu, 30 Sep 2010 17:26:10 +0000 (10:26 -0700)]
Merge "Fix loopfilter delta zero transitions"
Adrian Grange [Thu, 30 Sep 2010 09:06:09 +0000 (10:06 +0100)]
Changed defaults & range checking for AltRef params
Modified the range checking of parameters used in the
AltRef temporal filter (arnr-max-frames, arnr-strength,
arnr-type) and default values for each of them.
Change-Id: Ib261028d501b9523f6e44cb4790cc52167b6e92b
John Koleszar [Wed, 29 Sep 2010 17:53:08 +0000 (13:53 -0400)]
Rename mode_ref_lf_test_function
This function graduated from being a test func to something that's on
by default. Rename it and remove some spurious comments that confuse
its status.
Change-Id: I689695a3ad29c35e9a72a43ec93766733ac6c20b
Fritz Koenig [Wed, 29 Sep 2010 17:47:01 +0000 (10:47 -0700)]
Merge "Optimizations on the loopfilters."
John Koleszar [Wed, 29 Sep 2010 17:04:04 +0000 (13:04 -0400)]
Fix loopfilter delta zero transitions
Loopfilter deltas are initialized to zero on keyframes in the decoder.
The values then persist from the previous frame unless an update bit
is set in the bitstream. This data is not included in the entropy
data saved by the 'refresh entropy' bit in the bitstream, so it is
effectively an additional contextual element beyond the 3 ref-frames
and the entropy data.
The encoder was treating this delta update bit as update-if-nonzero,
meaning that the value would be refreshed even if it hadn't changed,
and more significantly, if the correct value for the delta changed
to zero, the update wouldn't be sent, and the decoder would preserve
the last (presumably non-zero) value.
This patch updates the encoder to send an update only if the value
has changed from the previously transmitted value. It also forces the
value to be transmitted in error resilient mode, to account for lost
context in the event of lost frames.
Change-Id: I56671d5b42965d0166ac226765dbfce3e5301868
Paul Wilkins [Wed, 29 Sep 2010 12:22:05 +0000 (13:22 +0100)]
Change to coefficient optimization rules.
Allow coefficient optimization for good quality speed 0.
Change-Id: Id0cb363df6823c6798671584fbba097916a7df2c
Adrian Grange [Wed, 29 Sep 2010 12:13:41 +0000 (05:13 -0700)]
Merge "Moved row-specific computation of MV bounds out of col loop"
Adrian Grange [Wed, 29 Sep 2010 12:03:07 +0000 (13:03 +0100)]
Moved row-specific computation of MV bounds out of col loop
Moved the bounds computation on vertical MV component out
of the loop that processes MBs within a MB row.
Paul Wilkins [Wed, 29 Sep 2010 11:03:19 +0000 (12:03 +0100)]
Control of active min quantizer for two pass.
Create look up tables for controlling the active quantizer range.
Some initial tuning to improve quality circa 0.5% on test set.
Clean up of some stats output code
Change-Id: Ia698a8525f8b8129a503cadace3ee73fe888f543
Fritz Koenig [Tue, 28 Sep 2010 19:01:34 +0000 (12:01 -0700)]
Optimizations on the loopfilters.
- Scheduling for Atom processors
- Combining of macros to allow for better interleaving
- Change from multiplies to adds for main filter
- Use of movhps/movlps to fill xmm registers without
shifting and orring
Change-Id: I0b3500a5f58abf7085253ec92d64c8a96723040b
Adrian Grange [Tue, 28 Sep 2010 15:52:19 +0000 (16:52 +0100)]
Enabled AltRef motion map creation
Enabled the first-pass encode to output the
map of macroblock coding modes required by
the AltRef filter.
Adrian Grange [Tue, 28 Sep 2010 15:34:44 +0000 (08:34 -0700)]
Merge "Made AltRef filter adaptive & added motion compensation"
Adrian Grange [Tue, 28 Sep 2010 14:23:41 +0000 (15:23 +0100)]
Made AltRef filter adaptive & added motion compensation
Modified AltRef temporal filter to adapt filter length based
on macroblock coding modes selected during first-pass
encode.
Also added sub-pixel motion compensation to the AltRef
filter.
Johann [Tue, 28 Sep 2010 14:10:09 +0000 (07:10 -0700)]
Merge "update gitignore"
Johann [Tue, 28 Sep 2010 13:31:11 +0000 (09:31 -0400)]
update gitignore
this was excluding all .asm files when it should have just been .asm
files in the top level directory and .asm.s files lower down. also be
more restrictive on some other items, and run the whole thing through
sort to keep it organized
Change-Id: Ia48525033226b13098a491ce89465d0377b990c2
Timothy B. Terriberry [Tue, 28 Sep 2010 00:18:18 +0000 (17:18 -0700)]
Add 4-tap version of 2nd-pass ARMv6 MC filter.
The existing code applied a 6-tap filter with 0's on either end.
We're already paying the branch penalty to avoid computing the two
extra columns needed as input to this filter.
We might as well save time computing the filter as well.
This reduces the inner loop from 21 instructions to 16, the number
of loads per iteration from 4 to 1, and the number of multiplies
from 7 to 4.
The gain in overall decoding performance, however, is small (less
than 1%).
This change also means we now valgrind clean on ARMv6, which is
its real purpose.
The errors reported here were valgrind's fault (it does not detect
that 0 times an uninitialized value is initialized), but Julian
Seward says it would slow down valgrind considerably to make such
checks.
Speeding up libvpx rather, even by a small amount, seems a much
better idea if only to enable proper valgrind checking of the
rest of the codec.
Change-Id: Ifb376ea195e086b60f61daf1097d8910c4d8ff16