Commit 7d26be63 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '5ff998a2'

* commit '5ff998a2':
  flacenc: use uint64_t for bit counts
  flacenc: remove wasted trailing 0 bits
  lavu: add av_ctz() for trailing zero bit count
  flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian
  fate: aac: Place LATM tests and general AAC tests in different groups
  build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()

Conflicts:
	doc/APIchanges
	libavutil/version.h
	tests/fate/aac.mak
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e859339e 5ff998a2
...@@ -110,6 +110,9 @@ API changes, most recent first: ...@@ -110,6 +110,9 @@ API changes, most recent first:
2012-03-26 - a67d9cf - lavfi 2.66.100 2012-03-26 - a67d9cf - lavfi 2.66.100
Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions. Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.
2012-xx-xx - xxxxxxx - lavu 52.1.0 - intmath.h
Add av_ctz() for trailing zero bit count
2012-10-18 - xxxxxxx - lavu 51.45.0 - error.h 2012-10-18 - xxxxxxx - lavu 51.45.0 - error.h
Add AVERROR_EXPERIMENTAL Add AVERROR_EXPERIMENTAL
......
This diff is collapsed.
...@@ -27,7 +27,7 @@ OBJS = allformats.o \ ...@@ -27,7 +27,7 @@ OBJS = allformats.o \
OBJS-$(CONFIG_NETWORK) += network.o OBJS-$(CONFIG_NETWORK) += network.o
# muxers/demuxers # muxers/demuxers
OBJS-$(CONFIG_A64_MUXER) += a64.o OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o
OBJS-$(CONFIG_AAC_DEMUXER) += aacdec.o rawdec.o OBJS-$(CONFIG_AAC_DEMUXER) += aacdec.o rawdec.o
OBJS-$(CONFIG_AC3_DEMUXER) += ac3dec.o rawdec.o OBJS-$(CONFIG_AC3_DEMUXER) += ac3dec.o rawdec.o
OBJS-$(CONFIG_AC3_MUXER) += rawenc.o OBJS-$(CONFIG_AC3_MUXER) += rawenc.o
......
...@@ -73,10 +73,10 @@ OBJS = adler32.o \ ...@@ -73,10 +73,10 @@ OBJS = adler32.o \
float_dsp.o \ float_dsp.o \
imgutils.o \ imgutils.o \
intfloat_readwrite.o \ intfloat_readwrite.o \
intmath.o \
lfg.o \ lfg.o \
lls.o \ lls.o \
log.o \ log.o \
log2.o \
log2_tab.o \ log2_tab.o \
mathematics.o \ mathematics.o \
md5.o \ md5.o \
......
...@@ -32,3 +32,8 @@ int av_log2_16bit(unsigned v) ...@@ -32,3 +32,8 @@ int av_log2_16bit(unsigned v)
{ {
return ff_log2_16bit(v); return ff_log2_16bit(v);
} }
int av_ctz(int v)
{
return ff_ctz(v);
}
...@@ -89,6 +89,61 @@ static av_always_inline av_const int ff_log2_16bit_c(unsigned int v) ...@@ -89,6 +89,61 @@ static av_always_inline av_const int ff_log2_16bit_c(unsigned int v)
#define av_log2 ff_log2 #define av_log2 ff_log2
#define av_log2_16bit ff_log2_16bit #define av_log2_16bit ff_log2_16bit
/**
* @}
*/
/**
* @addtogroup lavu_math
* @{
*/
#if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4)
#ifndef ff_ctz
#define ff_ctz(v) __builtin_ctz(v)
#endif
#endif
#ifndef ff_ctz
#define ff_ctz ff_ctz_c
static av_always_inline av_const int ff_ctz_c(int v)
{
int c;
if (v & 0x1)
return 0;
c = 1;
if (!(v & 0xffff)) {
v >>= 16;
c += 16;
}
if (!(v & 0xff)) {
v >>= 8;
c += 8;
}
if (!(v & 0xf)) {
v >>= 4;
c += 4;
}
if (!(v & 0x3)) {
v >>= 2;
c += 2;
}
c -= v & 0x1;
return c;
}
#endif
/**
* Trailing zero bit count.
*
* @param v input value. If v is 0, the result is undefined.
* @return the number of trailing 0-bits
*/
int av_ctz(int v);
/** /**
* @} * @}
*/ */
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
*/ */
#define LIBAVUTIL_VERSION_MAJOR 52 #define LIBAVUTIL_VERSION_MAJOR 52
#define LIBAVUTIL_VERSION_MINOR 4 #define LIBAVUTIL_VERSION_MINOR 5
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
......
...@@ -46,7 +46,7 @@ FATE_AAC += fate-aac-al_sbr_ps_06_ur ...@@ -46,7 +46,7 @@ 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 $(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-al_sbr_ps_06_ur: REF = $(SAMPLES)/aac/al_sbr_ps_06_ur.s16
FATE_AAC += fate-aac-latm_000000001180bc60 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 $(SAMPLES)/aac/latm_000000001180bc60.mpg
fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16 fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16
...@@ -54,7 +54,7 @@ FATE_AAC += fate-aac-ap05_48 ...@@ -54,7 +54,7 @@ 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 $(SAMPLES)/aac/ap05_48.mp4
fate-aac-ap05_48: REF = $(SAMPLES)/aac/ap05_48.s16 fate-aac-ap05_48: REF = $(SAMPLES)/aac/ap05_48.s16
FATE_AAC += fate-aac-latm_stereo_to_51 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 $(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-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51_ref.s16
...@@ -88,8 +88,12 @@ fate-aac-ln-encode: CMP_SHIFT = -4096 ...@@ -88,8 +88,12 @@ fate-aac-ln-encode: CMP_SHIFT = -4096
fate-aac-ln-encode: CMP_TARGET = 65 fate-aac-ln-encode: CMP_TARGET = 65
fate-aac-ln-encode: SIZE_TOLERANCE = 3560 fate-aac-ln-encode: SIZE_TOLERANCE = 3560
FATE_SAMPLES_FFMPEG += $(FATE_AAC) $(FATE_AAC_ENCODE) FATE_AAC_ALL = $(FATE_AAC) $(FATE_AAC_LATM)
fate-aac: $(FATE_AAC) $(FATE_AAC_ENCODE)
$(FATE_AAC): CMP = oneoff $(FATE_AAC_ALL): CMP = oneoff
$(FATE_AAC): FUZZ = 2 $(FATE_AAC_ALL): FUZZ = 2
FATE_SAMPLES_FFMPEG += $(FATE_AAC_ALL) $(FATE_AAC_ENCODE)
fate-aac: $(FATE_AAC_ALL) $(FATE_AAC_ENCODE)
fate-aac-latm: $(FATE_AAC_LATM)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment