virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  dwt: K&R prettyprinting cosmetics
  Remove libnut wrapper
  fate: change name of FATE samples location environment variable
  avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps.
  http: Factorize the code by adding http_read_header()

Conflicts:
	configure
	doc/APIchanges
	doc/fate.texi
	libavcodec/dwt.c
	libavcodec/dwt.h
	libavformat/Makefile
	libavformat/avformat.h
	libavformat/libnut.c
	libavformat/matroskaenc.c
	libavformat/utils.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-05-21 23:53:39 +02:00
commit 938adb7abc
12 changed files with 690 additions and 514 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

543
libavcodec/dwt.c
View File

@ -24,7 +24,9 @@
#include "dwt.h" #include "dwt.h"
#include "libavcodec/x86/dwt.h" #include "libavcodec/x86/dwt.h"
void ff_slice_buffer_init(slice_buffer * buf, int line_count, int max_allocated_lines, int line_width, IDWTELEM * base_buffer) void ff_slice_buffer_init(slice_buffer *buf, int line_count,
int max_allocated_lines, int line_width,
IDWTELEM *base_buffer)
{ {
int i; int i;
@ -35,9 +37,8 @@ void ff_slice_buffer_init(slice_buffer * buf, int line_count, int max_allocated_
buf->line = av_mallocz(sizeof(IDWTELEM *) * line_count); buf->line = av_mallocz(sizeof(IDWTELEM *) * line_count);
buf->data_stack = av_malloc(sizeof(IDWTELEM *) * max_allocated_lines); buf->data_stack = av_malloc(sizeof(IDWTELEM *) * max_allocated_lines);
for(i = 0; i < max_allocated_lines; i++){ for (i = 0; i < max_allocated_lines; i++)
buf->data_stack[i] = av_malloc(sizeof(IDWTELEM) * line_width); buf->data_stack[i] = av_malloc(sizeof(IDWTELEM) * line_width);
}
buf->data_stack_top = max_allocated_lines - 1; buf->data_stack_top = max_allocated_lines - 1;
} }
@ -47,6 +48,7 @@ IDWTELEM * ff_slice_buffer_load_line(slice_buffer * buf, int line)
IDWTELEM *buffer; IDWTELEM *buffer;
assert(buf->data_stack_top >= 0); assert(buf->data_stack_top >= 0);
// assert(!buf->line[line]);
if (buf->line[line]) if (buf->line[line])
return buf->line[line]; return buf->line[line];
@ -73,37 +75,37 @@ void ff_slice_buffer_release(slice_buffer * buf, int line)
void ff_slice_buffer_flush(slice_buffer *buf) void ff_slice_buffer_flush(slice_buffer *buf)
{ {
int i; int i;
for(i = 0; i < buf->line_count; i++){ for (i = 0; i < buf->line_count; i++)
if (buf->line[i]) if (buf->line[i])
ff_slice_buffer_release(buf, i); ff_slice_buffer_release(buf, i);
} }
}
void ff_slice_buffer_destroy(slice_buffer *buf) void ff_slice_buffer_destroy(slice_buffer *buf)
{ {
int i; int i;
ff_slice_buffer_flush(buf); ff_slice_buffer_flush(buf);
for(i = buf->data_count - 1; i >= 0; i--){ for (i = buf->data_count - 1; i >= 0; i--)
av_freep(&buf->data_stack[i]); av_freep(&buf->data_stack[i]);
}
av_freep(&buf->data_stack); av_freep(&buf->data_stack);
av_freep(&buf->line); av_freep(&buf->line);
} }
static inline int mirror(int v, int m){ static inline int mirror(int v, int m)
{
while ((unsigned)v > (unsigned)m) { while ((unsigned)v > (unsigned)m) {
v = -v; v = -v;
if(v < 0) v+= 2*m; if (v < 0)
v += 2 * m;
} }
return v; return v;
} }
static av_always_inline void static av_always_inline void lift(DWTELEM *dst, DWTELEM *src, DWTELEM *ref,
lift(DWTELEM *dst, DWTELEM *src, DWTELEM *ref,
int dst_step, int src_step, int ref_step, int dst_step, int src_step, int ref_step,
int width, int mul, int add, int shift, int width, int mul, int add, int shift,
int highpass, int inverse){ int highpass, int inverse)
{
const int mirror_left = !highpass; const int mirror_left = !highpass;
const int mirror_right = (width & 1) ^ highpass; const int mirror_right = (width & 1) ^ highpass;
const int w = (width >> 1) - 1 + (highpass & width); const int w = (width >> 1) - 1 + (highpass & width);
@ -116,26 +118,24 @@ lift(DWTELEM *dst, DWTELEM *src, DWTELEM *ref,
src += src_step; src += src_step;
} }
for(i=0; i<w; i++){ for (i = 0; i < w; i++)
dst[i * dst_step] = dst[i * dst_step] = LIFT(src[i * src_step],
LIFT(src[i * src_step], ((mul * (ref[i * ref_step] +
((mul * (ref[i * ref_step] + ref[(i + 1) * ref_step]) + add) >> shift), ref[(i + 1) * ref_step]) +
add) >> shift),
inverse); inverse);
}
if(mirror_right){ if (mirror_right)
dst[w * dst_step] = dst[w * dst_step] = LIFT(src[w * src_step],
LIFT(src[w * src_step],
((mul * 2 * ref[w * ref_step] + add) >> shift), ((mul * 2 * ref[w * ref_step] + add) >> shift),
inverse); inverse);
} }
}
static av_always_inline void static av_always_inline void inv_lift(IDWTELEM *dst, IDWTELEM *src, IDWTELEM *ref,
inv_lift(IDWTELEM *dst, IDWTELEM *src, IDWTELEM *ref,
int dst_step, int src_step, int ref_step, int dst_step, int src_step, int ref_step,
int width, int mul, int add, int shift, int width, int mul, int add, int shift,
int highpass, int inverse){ int highpass, int inverse)
{
const int mirror_left = !highpass; const int mirror_left = !highpass;
const int mirror_right = (width & 1) ^ highpass; const int mirror_right = (width & 1) ^ highpass;
const int w = (width >> 1) - 1 + (highpass & width); const int w = (width >> 1) - 1 + (highpass & width);
@ -143,35 +143,31 @@ inv_lift(IDWTELEM *dst, IDWTELEM *src, IDWTELEM *ref,
#define LIFT(src, ref, inv) ((src) + ((inv) ? -(ref) : +(ref))) #define LIFT(src, ref, inv) ((src) + ((inv) ? -(ref) : +(ref)))
if (mirror_left) { if (mirror_left) {
dst[0] = dst[0] = LIFT(src[0], ((mul * 2 * ref[0] + add) >> shift), inverse);
LIFT(src[0],
((mul * 2 * ref[0] + add) >> shift),
inverse);
dst += dst_step; dst += dst_step;
src += src_step; src += src_step;
} }
for(i = 0; i < w; i++){ for (i = 0; i < w; i++)
dst[i * dst_step] = dst[i * dst_step] = LIFT(src[i * src_step],
LIFT(src[i * src_step], ((mul * (ref[i * ref_step] +
((mul * (ref[i * ref_step] + ref[(i + 1) * ref_step]) + add) >> shift), ref[(i + 1) * ref_step]) +
add) >> shift),
inverse); inverse);
}
if (mirror_right) { if (mirror_right) {
dst[w * dst_step] = dst[w * dst_step] = LIFT(src[w * src_step],
LIFT(src[w * src_step],
((mul * 2 * ref[w * ref_step] + add) >> shift), ((mul * 2 * ref[w * ref_step] + add) >> shift),
inverse); inverse);
} }
} }
#ifndef liftS #ifndef liftS
static av_always_inline void static av_always_inline void liftS(DWTELEM *dst, DWTELEM *src, DWTELEM *ref,
liftS(DWTELEM *dst, DWTELEM *src, DWTELEM *ref,
int dst_step, int src_step, int ref_step, int dst_step, int src_step, int ref_step,
int width, int mul, int add, int shift, int width, int mul, int add, int shift,
int highpass, int inverse){ int highpass, int inverse)
{
const int mirror_left = !highpass; const int mirror_left = !highpass;
const int mirror_right = (width & 1) ^ highpass; const int mirror_right = (width & 1) ^ highpass;
const int w = (width >> 1) - 1 + (highpass & width); const int w = (width >> 1) - 1 + (highpass & width);
@ -179,32 +175,33 @@ liftS(DWTELEM *dst, DWTELEM *src, DWTELEM *ref,
assert(shift == 4); assert(shift == 4);
#define LIFTS(src, ref, inv) \ #define LIFTS(src, ref, inv) \
((inv) ? \ ((inv) ? (src) + (((ref) + 4 * (src)) >> shift) \
(src) + (((ref) + 4 * (src)) >> shift): \ : -((-16 * (src) + (ref) + add / \
-((-16 * (src) + (ref) + add / 4 + 1 + (5 << 25)) / (5 * 4) - (1 << 23))) 4 + 1 + (5 << 25)) / (5 * 4) - (1 << 23)))
if (mirror_left) { if (mirror_left) {
dst[0] = LIFTS(src[0], mul * 2 * ref[0] + add, inverse); dst[0] = LIFTS(src[0], mul * 2 * ref[0] + add, inverse);
dst += dst_step; dst += dst_step;
src += src_step; src += src_step;
} }
for(i = 0; i < w; i++){ for (i = 0; i < w; i++)
dst[i * dst_step] = dst[i * dst_step] = LIFTS(src[i * src_step],
LIFTS(src[i * src_step], mul * (ref[i * ref_step] +
mul * (ref[i * ref_step] + ref[(i+1) * ref_step]) + add, 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); inverse);
} }
if(mirror_right){ static av_always_inline void inv_liftS(IDWTELEM *dst, IDWTELEM *src,
dst[w * dst_step] = IDWTELEM *ref, int dst_step,
LIFTS(src[w * src_step], mul * 2 * ref[w * ref_step] + add, inverse); int src_step, int ref_step,
}
}
static av_always_inline void
inv_liftS(IDWTELEM *dst, IDWTELEM *src, IDWTELEM *ref,
int dst_step, int src_step, int ref_step,
int width, int mul, int add, int shift, int width, int mul, int add, int shift,
int highpass, int inverse){ int highpass, int inverse)
{
const int mirror_left = !highpass; const int mirror_left = !highpass;
const int mirror_right = (width & 1) ^ highpass; const int mirror_right = (width & 1) ^ highpass;
const int w = (width >> 1) - 1 + (highpass & width); const int w = (width >> 1) - 1 + (highpass & width);
@ -212,34 +209,33 @@ inv_liftS(IDWTELEM *dst, IDWTELEM *src, IDWTELEM *ref,
assert(shift == 4); assert(shift == 4);
#define LIFTS(src, ref, inv) \ #define LIFTS(src, ref, inv) \
((inv) ? \ ((inv) ? (src) + (((ref) + 4 * (src)) >> shift) \
(src) + (((ref) + 4 * (src)) >> shift): \ : -((-16 * (src) + (ref) + add / \
-((-16 * (src) + (ref) + add / 4 + 1 + (5 << 25)) / (5 * 4) - (1 << 23))) 4 + 1 + (5 << 25)) / (5 * 4) - (1 << 23)))
if (mirror_left) { if (mirror_left) {
dst[0] = LIFTS(src[0], mul * 2 * ref[0] + add, inverse); dst[0] = LIFTS(src[0], mul * 2 * ref[0] + add, inverse);
dst += dst_step; dst += dst_step;
src += src_step; src += src_step;
} }
for(i = 0; i < w; i++){ for (i = 0; i < w; i++)
dst[i * dst_step] = dst[i * dst_step] = LIFTS(src[i * src_step],
LIFTS(src[i * src_step], mul * (ref[i * ref_step] +
mul * (ref[i * ref_step] + ref[(i+1) * ref_step]) + add, ref[(i + 1) * ref_step]) + add,
inverse); inverse);
}
if(mirror_right){ if (mirror_right)
dst[w * dst_step] = dst[w * dst_step] = LIFTS(src[w * src_step],
LIFTS(src[w * src_step], mul * 2 * ref[w * ref_step] + add, inverse); mul * 2 * ref[w * ref_step] + add, inverse);
}
} }
#endif /* ! liftS */ #endif /* ! liftS */
static void horizontal_decompose53i(DWTELEM *b, int width){ static void horizontal_decompose53i(DWTELEM *b, int width)
{
DWTELEM temp[width]; DWTELEM temp[width];
const int width2 = width >> 1; const int width2 = width >> 1;
const int w2 = (width+1)>>1;
int x; int x;
const int w2 = (width + 1) >> 1;
for (x = 0; x < width2; x++) { for (x = 0; x < width2; x++) {
temp[x] = b[2 * x]; temp[x] = b[2 * x];
@ -284,23 +280,27 @@ static void horizontal_decompose53i(DWTELEM *b, int width){
#endif /* 0 */ #endif /* 0 */
} }
static void vertical_decompose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){ static void vertical_decompose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2,
int width)
{
int i; int i;
for(i = 0; i < width; i++){ for (i = 0; i < width; i++)
b1[i] -= (b0[i] + b2[i]) >> 1; b1[i] -= (b0[i] + b2[i]) >> 1;
} }
}
static void vertical_decompose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){ static void vertical_decompose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2,
int width)
{
int i; int i;
for(i = 0; i < width; i++){ for (i = 0; i < width; i++)
b1[i] += (b0[i] + b2[i] + 2) >> 2; b1[i] += (b0[i] + b2[i] + 2) >> 2;
} }
}
static void spatial_decompose53i(DWTELEM *buffer, int width, int height, int stride){ static void spatial_decompose53i(DWTELEM *buffer, int width, int height,
int stride)
{
int y; int y;
DWTELEM *b0 = buffer + mirror(-2 - 1, height - 1) * stride; DWTELEM *b0 = buffer + mirror(-2 - 1, height - 1) * stride;
DWTELEM *b1 = buffer + mirror(-2, height - 1) * stride; DWTELEM *b1 = buffer + mirror(-2, height - 1) * stride;
@ -309,18 +309,23 @@ static void spatial_decompose53i(DWTELEM *buffer, int width, int height, int str
DWTELEM *b2 = buffer + mirror(y + 1, height - 1) * stride; DWTELEM *b2 = buffer + mirror(y + 1, height - 1) * stride;
DWTELEM *b3 = buffer + mirror(y + 2, height - 1) * stride; DWTELEM *b3 = buffer + mirror(y + 2, height - 1) * stride;
if(y + 1 < (unsigned)height) horizontal_decompose53i(b2, width); if (y + 1 < (unsigned)height)
if(y + 2 < (unsigned)height) horizontal_decompose53i(b3, width); horizontal_decompose53i(b2, width);
if (y + 2 < (unsigned)height)
horizontal_decompose53i(b3, width);
if(y + 1 < (unsigned)height) vertical_decompose53iH0(b1, b2, b3, width); if (y + 1 < (unsigned)height)
if(y + 0 < (unsigned)height) vertical_decompose53iL0(b0, b1, b2, width); vertical_decompose53iH0(b1, b2, b3, width);
if (y + 0 < (unsigned)height)
vertical_decompose53iL0(b0, b1, b2, width);
b0 = b2; b0 = b2;
b1 = b3; b1 = b3;
} }
} }
static void horizontal_decompose97i(DWTELEM *b, int width){ static void horizontal_decompose97i(DWTELEM *b, int width)
{
DWTELEM temp[width]; DWTELEM temp[width];
const int w2 = (width + 1) >> 1; const int w2 = (width + 1) >> 1;
@ -330,44 +335,50 @@ static void horizontal_decompose97i(DWTELEM *b, int width){
lift(b, temp, b + w2, 1, 1, 1, width, W_DM, W_DO, W_DS, 0, 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,
static void vertical_decompose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){ int width)
{
int i; int i;
for(i = 0; i < width; i++){ for (i = 0; i < width; i++)
b1[i] -= (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS; b1[i] -= (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS;
} }
}
static void vertical_decompose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){ static void vertical_decompose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2,
int width)
{
int i; int i;
for(i=0; i < width; i++){ for (i = 0; i < width; i++)
b1[i] += (W_CM * (b0[i] + b2[i]) + W_CO) >> W_CS; b1[i] += (W_CM * (b0[i] + b2[i]) + W_CO) >> W_CS;
} }
}
static void vertical_decompose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){ static void vertical_decompose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2,
int width)
{
int i; int i;
for(i = 0; i < width; i++){ for (i = 0; i < width; i++)
#ifdef liftS #ifdef liftS
b1[i] -= (W_BM * (b0[i] + b2[i]) + W_BO) >> W_BS; b1[i] -= (W_BM * (b0[i] + b2[i]) + W_BO) >> W_BS;
#else #else
b1[i] = (16 * 4 * b1[i] - 4 * (b0[i] + b2[i]) + W_BO * 5 + (5 << 27)) / (5 * 16) - (1 << 23); b1[i] = (16 * 4 * b1[i] - 4 * (b0[i] + b2[i]) + W_BO * 5 + (5 << 27)) /
(5 * 16) - (1 << 23);
#endif #endif
} }
}
static void vertical_decompose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){ static void vertical_decompose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2,
int width)
{
int i; int i;
for(i = 0; i < width; i++){ for (i = 0; i < width; i++)
b1[i] += (W_DM * (b0[i] + b2[i]) + W_DO) >> W_DS; b1[i] += (W_DM * (b0[i] + b2[i]) + W_DO) >> W_DS;
} }
}
static void spatial_decompose97i(DWTELEM *buffer, int width, int height, int stride){ static void spatial_decompose97i(DWTELEM *buffer, int width, int height,
int stride)
{
int y; int y;
DWTELEM *b0 = buffer + mirror(-4 - 1, height - 1) * stride; DWTELEM *b0 = buffer + mirror(-4 - 1, height - 1) * stride;
DWTELEM *b1 = buffer + mirror(-4, height - 1) * stride; DWTELEM *b1 = buffer + mirror(-4, height - 1) * stride;
@ -378,13 +389,19 @@ static void spatial_decompose97i(DWTELEM *buffer, int width, int height, int str
DWTELEM *b4 = buffer + mirror(y + 3, height - 1) * stride; DWTELEM *b4 = buffer + mirror(y + 3, height - 1) * stride;
DWTELEM *b5 = buffer + mirror(y + 4, height - 1) * stride; DWTELEM *b5 = buffer + mirror(y + 4, height - 1) * stride;
if(y + 3 < (unsigned)height) horizontal_decompose97i(b4, width); if (y + 3 < (unsigned)height)
if(y + 4 < (unsigned)height) horizontal_decompose97i(b5, width); horizontal_decompose97i(b4, width);
if (y + 4 < (unsigned)height)
horizontal_decompose97i(b5, width);
if(y + 3 < (unsigned)height) vertical_decompose97iH0(b3, b4, b5, width); if (y + 3 < (unsigned)height)
if(y + 2 < (unsigned)height) vertical_decompose97iL0(b2, b3, b4, width); vertical_decompose97iH0(b3, b4, b5, width);
if(y + 1 < (unsigned)height) vertical_decompose97iH1(b1, b2, b3, width); if (y + 2 < (unsigned)height)
if(y + 0 < (unsigned)height) vertical_decompose97iL1(b0, b1, b2, width); 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; b0 = b2;
b1 = b3; b1 = b3;
@ -393,18 +410,29 @@ static void spatial_decompose97i(DWTELEM *buffer, int width, int height, int str
} }
} }
void ff_spatial_dwt(DWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){ void ff_spatial_dwt(DWTELEM *buffer, int width, int height, int stride,
int type, int decomposition_count)
{
int level; int level;
for (level = 0; level < decomposition_count; level++) { for (level = 0; level < decomposition_count; level++) {
switch (type) { switch (type) {
case DWT_97: spatial_decompose97i(buffer, width >> level, height >> level, stride << level); break; case DWT_97:
case DWT_53: spatial_decompose53i(buffer, width >> level, height >> level, stride << level); break; spatial_decompose97i(buffer,
width >> level, height >> level,
stride << level);
break;
case DWT_53:
spatial_decompose53i(buffer,
width >> level, height >> level,
stride << level);
break;
} }
} }
} }
static void horizontal_compose53i(IDWTELEM *b, int width){ static void horizontal_compose53i(IDWTELEM *b, int width)
{
IDWTELEM temp[width]; IDWTELEM temp[width];
const int width2 = width >> 1; const int width2 = width >> 1;
const int w2 = (width + 1) >> 1; const int w2 = (width + 1) >> 1;
@ -429,40 +457,55 @@ static void horizontal_compose53i(IDWTELEM *b, int width){
b[x - 1] = temp[x - 1] + b[x - 2]; b[x - 1] = temp[x - 1] + b[x - 2];
} }
static void vertical_compose53iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ static void vertical_compose53iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
int width)
{
int i; int i;
for(i = 0; i < width; i++){ for (i = 0; i < width; i++)
b1[i] += (b0[i] + b2[i]) >> 1; b1[i] += (b0[i] + b2[i]) >> 1;
} }
}
static void vertical_compose53iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ static void vertical_compose53iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
int width)
{
int i; int i;
for(i = 0; i < width; i++){ for (i = 0; i < width; i++)
b1[i] -= (b0[i] + b2[i] + 2) >> 2; b1[i] -= (b0[i] + b2[i] + 2) >> 2;
} }
}
static void spatial_compose53i_buffered_init(DWTCompose *cs, slice_buffer * sb, int height, int stride_line){ static void spatial_compose53i_buffered_init(DWTCompose *cs, slice_buffer *sb,
cs->b0 = slice_buffer_get_line(sb, mirror(-1-1, height - 1) * stride_line); 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->b1 = slice_buffer_get_line(sb, mirror(-1, height - 1) * stride_line);
cs->y = -1; cs->y = -1;
} }
static void spatial_compose53i_init(DWTCompose *cs, IDWTELEM *buffer, int height, int stride){ static void spatial_compose53i_init(DWTCompose *cs, IDWTELEM *buffer,
int height, int stride)
{
cs->b0 = buffer + mirror(-1 - 1, height - 1) * stride; cs->b0 = buffer + mirror(-1 - 1, height - 1) * stride;
cs->b1 = buffer + mirror(-1, height - 1) * stride; cs->b1 = buffer + mirror(-1, height - 1) * stride;
cs->y = -1; cs->y = -1;
} }
static void spatial_compose53i_dy_buffered(DWTCompose *cs, slice_buffer * sb, int width, int height, int stride_line){ static void spatial_compose53i_dy_buffered(DWTCompose *cs, slice_buffer *sb,
int width, int height,
int stride_line)
{
int y = cs->y; int y = cs->y;
IDWTELEM *b0 = cs->b0; IDWTELEM *b0 = cs->b0;
IDWTELEM *b1 = cs->b1; IDWTELEM *b1 = cs->b1;
IDWTELEM *b2 = slice_buffer_get_line(sb, mirror(y + 1, height-1) * stride_line); IDWTELEM *b2 = slice_buffer_get_line(sb,
IDWTELEM *b3 = slice_buffer_get_line(sb, mirror(y + 2, height-1) * stride_line); 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) { if (y + 1 < (unsigned)height && y < (unsigned)height) {
int x; int x;
@ -472,45 +515,57 @@ static void spatial_compose53i_dy_buffered(DWTCompose *cs, slice_buffer * sb, in
b1[x] += (b0[x] + b2[x]) >> 1; b1[x] += (b0[x] + b2[x]) >> 1;
} }
} else { } else {
if(y + 1 < (unsigned)height) vertical_compose53iL0(b1, b2, b3, width); if (y + 1 < (unsigned)height)
if(y + 0 < (unsigned)height) vertical_compose53iH0(b0, b1, b2, width); 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, width); if (y - 1 < (unsigned)height)
if(y + 0 <(unsigned)height) horizontal_compose53i(b1, width); horizontal_compose53i(b0, width);
if (y + 0 < (unsigned)height)
horizontal_compose53i(b1, width);
cs->b0 = b2; cs->b0 = b2;
cs->b1 = b3; cs->b1 = b3;
cs->y += 2; cs->y += 2;
} }
static void spatial_compose53i_dy(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride){ static void spatial_compose53i_dy(DWTCompose *cs, IDWTELEM *buffer, int width,
int height, int stride)
{
int y = cs->y; int y = cs->y;
IDWTELEM *b0 = cs->b0; IDWTELEM *b0 = cs->b0;
IDWTELEM *b1 = cs->b1; IDWTELEM *b1 = cs->b1;
IDWTELEM *b2 = buffer + mirror(y + 1, height - 1) * stride; IDWTELEM *b2 = buffer + mirror(y + 1, height - 1) * stride;
IDWTELEM *b3 = buffer + mirror(y + 2, 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 + 1 < (unsigned)height)
if(y + 0 < (unsigned)height) vertical_compose53iH0(b0, b1, b2, width); 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, width); if (y - 1 < (unsigned)height)
if(y + 0 < (unsigned)height) horizontal_compose53i(b1, width); horizontal_compose53i(b0, width);
if (y + 0 < (unsigned)height)
horizontal_compose53i(b1, width);
cs->b0 = b2; cs->b0 = b2;
cs->b1 = b3; cs->b1 = b3;
cs->y += 2; cs->y += 2;
} }
static void av_unused spatial_compose53i(IDWTELEM *buffer, int width, int height, int stride){ static void av_unused spatial_compose53i(IDWTELEM *buffer, int width,
int height, int stride)
{
DWTCompose cs; DWTCompose cs;
spatial_compose53i_init(&cs, buffer, height, stride); spatial_compose53i_init(&cs, buffer, height, stride);
while (cs.y <= height) while (cs.y <= height)
spatial_compose53i_dy(&cs, buffer, width, height, stride); spatial_compose53i_dy(&cs, buffer, width, height, stride);
} }
void ff_snow_horizontal_compose97i(IDWTELEM *b, int width)
void ff_snow_horizontal_compose97i(IDWTELEM *b, int width){ {
IDWTELEM temp[width]; IDWTELEM temp[width];
const int w2 = (width + 1) >> 1; const int w2 = (width + 1) >> 1;
@ -546,43 +601,50 @@ void ff_snow_horizontal_compose97i(IDWTELEM *b, int width){
#endif #endif
} }
static void vertical_compose97iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ static void vertical_compose97iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
int width)
{
int i; int i;
for(i=0; i<width; i++){ for (i = 0; i < width; i++)
b1[i] += (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS; b1[i] += (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS;
} }
}
static void vertical_compose97iH1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ static void vertical_compose97iH1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
int width)
{
int i; int i;
for(i=0; i<width; i++){ for (i = 0; i < width; i++)
b1[i] -= (W_CM * (b0[i] + b2[i]) + W_CO) >> W_CS; b1[i] -= (W_CM * (b0[i] + b2[i]) + W_CO) >> W_CS;
} }
}
static void vertical_compose97iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ static void vertical_compose97iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
int width)
{
int i; int i;
for(i=0; i<width; i++){ for (i = 0; i < width; i++)
#ifdef liftS #ifdef liftS
b1[i] += (W_BM * (b0[i] + b2[i]) + W_BO) >> W_BS; b1[i] += (W_BM * (b0[i] + b2[i]) + W_BO) >> W_BS;
#else #else
b1[i] += (W_BM * (b0[i] + b2[i]) + 4 * b1[i] + W_BO) >> W_BS; b1[i] += (W_BM * (b0[i] + b2[i]) + 4 * b1[i] + W_BO) >> W_BS;
#endif #endif
} }
}
static void vertical_compose97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ static void vertical_compose97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
int width)
{
int i; int i;
for(i=0; i<width; i++){ for (i = 0; i < width; i++)
b1[i] -= (W_DM * (b0[i] + b2[i]) + W_DO) >> W_DS; 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){ void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5,
int width)
{
int i; int i;
for (i = 0; i < width; i++) { for (i = 0; i < width; i++) {
@ -597,7 +659,9 @@ void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTE
} }
} }
static void spatial_compose97i_buffered_init(DWTCompose *cs, slice_buffer * sb, int height, int stride_line){ 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->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->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->b2 = slice_buffer_get_line(sb, mirror(-3 + 1, height - 1) * stride_line);
@ -605,7 +669,9 @@ static void spatial_compose97i_buffered_init(DWTCompose *cs, slice_buffer * sb,
cs->y = -3; cs->y = -3;
} }
static void spatial_compose97i_init(DWTCompose *cs, IDWTELEM *buffer, int height, int stride){ static void spatial_compose97i_init(DWTCompose *cs, IDWTELEM *buffer, int height,
int stride)
{
cs->b0 = buffer + mirror(-3 - 1, height - 1) * stride; cs->b0 = buffer + mirror(-3 - 1, height - 1) * stride;
cs->b1 = buffer + mirror(-3, height - 1) * stride; cs->b1 = buffer + mirror(-3, height - 1) * stride;
cs->b2 = buffer + mirror(-3 + 1, height - 1) * stride; cs->b2 = buffer + mirror(-3 + 1, height - 1) * stride;
@ -613,27 +679,40 @@ static void spatial_compose97i_init(DWTCompose *cs, IDWTELEM *buffer, int height
cs->y = -3; cs->y = -3;
} }
static void spatial_compose97i_dy_buffered(DWTContext *dsp, DWTCompose *cs, slice_buffer * sb, int width, int height, int stride_line){ static void spatial_compose97i_dy_buffered(DWTContext *dsp, DWTCompose *cs,
slice_buffer *sb, int width,
int height, int stride_line)
{
int y = cs->y; int y = cs->y;
IDWTELEM *b0 = cs->b0; IDWTELEM *b0 = cs->b0;
IDWTELEM *b1 = cs->b1; IDWTELEM *b1 = cs->b1;
IDWTELEM *b2 = cs->b2; IDWTELEM *b2 = cs->b2;
IDWTELEM *b3 = cs->b3; IDWTELEM *b3 = cs->b3;
IDWTELEM *b4= slice_buffer_get_line(sb, mirror(y + 3, height - 1) * stride_line); IDWTELEM *b4 = slice_buffer_get_line(sb,
IDWTELEM *b5= slice_buffer_get_line(sb, mirror(y + 4, height - 1) * stride_line); 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) { if (y > 0 && y + 4 < height) {
dsp->vertical_compose97i(b0, b1, b2, b3, b4, b5, width); dsp->vertical_compose97i(b0, b1, b2, b3, b4, b5, width);
} else { } else {
if(y+3<(unsigned)height) vertical_compose97iL1(b3, b4, b5, width); if (y + 3 < (unsigned)height)
if(y+2<(unsigned)height) vertical_compose97iH1(b2, b3, b4, width); vertical_compose97iL1(b3, b4, b5, width);
if(y+1<(unsigned)height) vertical_compose97iL0(b1, b2, b3, width); if (y + 2 < (unsigned)height)
if(y+0<(unsigned)height) vertical_compose97iH0(b0, b1, b2, width); 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, width); if (y - 1 < (unsigned)height)
if(y+0<(unsigned)height) dsp->horizontal_compose97i(b1, width); dsp->horizontal_compose97i(b0, width);
if (y + 0 < (unsigned)height)
dsp->horizontal_compose97i(b1, width);
cs->b0 = b2; cs->b0 = b2;
cs->b1 = b3; cs->b1 = b3;
@ -642,7 +721,9 @@ static void spatial_compose97i_dy_buffered(DWTContext *dsp, DWTCompose *cs, slic
cs->y += 2; cs->y += 2;
} }
static void spatial_compose97i_dy(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride){ static void spatial_compose97i_dy(DWTCompose *cs, IDWTELEM *buffer, int width,
int height, int stride)
{
int y = cs->y; int y = cs->y;
IDWTELEM *b0 = cs->b0; IDWTELEM *b0 = cs->b0;
IDWTELEM *b1 = cs->b1; IDWTELEM *b1 = cs->b1;
@ -651,13 +732,19 @@ static void spatial_compose97i_dy(DWTCompose *cs, IDWTELEM *buffer, int width, i
IDWTELEM *b4 = buffer + mirror(y + 3, height - 1) * stride; IDWTELEM *b4 = buffer + mirror(y + 3, height - 1) * stride;
IDWTELEM *b5 = buffer + mirror(y + 4, 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 + 3 < (unsigned)height)
if(y+2<(unsigned)height) vertical_compose97iH1(b2, b3, b4, width); vertical_compose97iL1(b3, b4, b5, width);
if(y+1<(unsigned)height) vertical_compose97iL0(b1, b2, b3, width); if (y + 2 < (unsigned)height)
if(y+0<(unsigned)height) vertical_compose97iH0(b0, b1, b2, width); 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, width); if (y - 1 < (unsigned)height)
if(y+0<(unsigned)height) ff_snow_horizontal_compose97i(b1, width); ff_snow_horizontal_compose97i(b0, width);
if (y + 0 < (unsigned)height)
ff_snow_horizontal_compose97i(b1, width);
cs->b0 = b2; cs->b0 = b2;
cs->b1 = b3; cs->b1 = b3;
@ -666,102 +753,146 @@ static void spatial_compose97i_dy(DWTCompose *cs, IDWTELEM *buffer, int width, i
cs->y += 2; cs->y += 2;
} }
static void av_unused spatial_compose97i(IDWTELEM *buffer, int width, int height, int stride){ static void av_unused spatial_compose97i(IDWTELEM *buffer, int width,
int height, int stride)
{
DWTCompose cs; DWTCompose cs;
spatial_compose97i_init(&cs, buffer, height, stride); spatial_compose97i_init(&cs, buffer, height, stride);
while (cs.y <= height) while (cs.y <= height)
spatial_compose97i_dy(&cs, buffer, width, height, stride); spatial_compose97i_dy(&cs, buffer, width, height, stride);
} }
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_init(DWTCompose *cs, slice_buffer *sb, int width,
int height, int stride_line, int type,
int decomposition_count)
{
int level; int level;
for (level = decomposition_count - 1; level >= 0; level--) { for (level = decomposition_count - 1; level >= 0; level--) {
switch (type) { switch (type) {
case DWT_97: spatial_compose97i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break; case DWT_97:
case DWT_53: spatial_compose53i_buffered_init(cs+level, sb, height>>level, stride_line<<level); break; 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, int width, int height, int stride_line, int type, int decomposition_count, int y){ void ff_spatial_idwt_buffered_slice(DWTContext *dsp, DWTCompose *cs,
slice_buffer *slice_buf, int width,
int height, int stride_line, int type,
int decomposition_count, int y)
{
const int support = type == 1 ? 3 : 5; const int support = type == 1 ? 3 : 5;
int level; int level;
if(type==2) return; if (type == 2)
return;
for(level=decomposition_count-1; level>=0; level--){ for (level = decomposition_count - 1; level >= 0; level--)
while (cs[level].y <= FFMIN((y >> level) + support, height >> level)) { while (cs[level].y <= FFMIN((y >> level) + support, height >> level)) {
switch (type) { switch (type) {
case DWT_97: spatial_compose97i_dy_buffered(dsp, cs+level, slice_buf, width>>level, height>>level, stride_line<<level); case DWT_97:
spatial_compose97i_dy_buffered(dsp, cs + level, slice_buf,
width >> level,
height >> level,
stride_line << level);
break; break;
case DWT_53: spatial_compose53i_dy_buffered(cs+level, slice_buf, width>>level, height>>level, stride_line<<level); case DWT_53:
spatial_compose53i_dy_buffered(cs + level, slice_buf,
width >> level,
height >> level,
stride_line << level);
break; break;
} }
} }
} }
}
static void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){ static void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *buffer, int width,
int height, int stride, int type,
int decomposition_count)
{
int level; int level;
for (level = decomposition_count - 1; level >= 0; level--) { for (level = decomposition_count - 1; level >= 0; level--) {
switch (type) { switch (type) {
case DWT_97: spatial_compose97i_init(cs+level, buffer, height>>level, stride<<level); break; case DWT_97:
case DWT_53: spatial_compose53i_init(cs+level, buffer, height>>level, stride<<level); break; 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, int width, int height, int stride, int type, int decomposition_count, int y){ static void ff_spatial_idwt_slice(DWTCompose *cs, IDWTELEM *buffer, int width,
int height, int stride, int type,
int decomposition_count, int y)
{
const int support = type == 1 ? 3 : 5; const int support = type == 1 ? 3 : 5;
int level; int level;
if(type==2) return; if (type == 2)
return;
for(level=decomposition_count-1; level>=0; level--){ for (level = decomposition_count - 1; level >= 0; level--)
while (cs[level].y <= FFMIN((y >> level) + support, height >> level)) { while (cs[level].y <= FFMIN((y >> level) + support, height >> level)) {
switch (type) { switch (type) {
case DWT_97: spatial_compose97i_dy(cs+level, buffer, width>>level, height>>level, stride<<level); case DWT_97:
spatial_compose97i_dy(cs + level, buffer, width >> level,
height >> level, stride << level);
break; break;
case DWT_53: spatial_compose53i_dy(cs+level, buffer, width>>level, height>>level, stride<<level); case DWT_53:
spatial_compose53i_dy(cs + level, buffer, width >> level,
height >> level, stride << level);
break; break;
} }
} }
} }
}
void ff_spatial_idwt(IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){ void ff_spatial_idwt(IDWTELEM *buffer, int width, int height, int stride,
int type, int decomposition_count)
{
DWTCompose cs[MAX_DECOMPOSITIONS]; DWTCompose cs[MAX_DECOMPOSITIONS];
int y; int y;
ff_spatial_idwt_init(cs, buffer, width, height, stride, type, decomposition_count); ff_spatial_idwt_init(cs, buffer, width, height, stride, type,
decomposition_count);
for (y = 0; y < height; y += 4) for (y = 0; y < height; y += 4)
ff_spatial_idwt_slice(cs, buffer, width, height, stride, type, decomposition_count, y); ff_spatial_idwt_slice(cs, buffer, 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){ 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; int s, i, j;
const int dec_count = w == 8 ? 3 : 4; const int dec_count = w == 8 ? 3 : 4;
int tmp[32 * 32]; int tmp[32 * 32];
int level, ori; int level, ori;
static const int scale[2][2][4][4] = { static const int scale[2][2][4][4] = {
{ {
{ { // 9/7 8x8 dec=3
// 9/7 8x8 dec=3
{ 268, 239, 239, 213 }, { 268, 239, 239, 213 },
{ 0, 224, 224, 152 }, { 0, 224, 224, 152 },
{ 0, 135, 135, 110 }, { 0, 135, 135, 110 },
},{ },
// 9/7 16x16 or 32x32 dec=4 { // 9/7 16x16 or 32x32 dec=4
{ 344, 310, 310, 280 }, { 344, 310, 310, 280 },
{ 0, 320, 320, 228 }, { 0, 320, 320, 228 },
{ 0, 175, 175, 136 }, { 0, 175, 175, 136 },
{ 0, 129, 129, 102 }, { 0, 129, 129, 102 },
} }
},{ },
{ {
// 5/3 8x8 dec=3 { // 5/3 8x8 dec=3
{ 275, 245, 245, 218 }, { 275, 245, 245, 218 },
{ 0, 230, 230, 156 }, { 0, 230, 230, 156 },
{ 0, 138, 138, 113 }, { 0, 138, 138, 113 },
},{ },
// 5/3 16x16 or 32x32 dec=4 { // 5/3 16x16 or 32x32 dec=4
{ 352, 317, 317, 286 }, { 352, 317, 317, 286 },
{ 0, 328, 328, 233 }, { 0, 328, 328, 233 },
{ 0, 180, 180, 140 }, { 0, 180, 180, 140 },
@ -785,46 +916,51 @@ static inline int w_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, in
s = 0; s = 0;
assert(w == h); assert(w == h);
for(level=0; level<dec_count; level++){ for (level = 0; level < dec_count; level++)
for (ori = level ? 1 : 0; ori < 4; ori++) { for (ori = level ? 1 : 0; ori < 4; ori++) {
int size = w >> (dec_count - level); int size = w >> (dec_count - level);
int sx = (ori & 1) ? size : 0; int sx = (ori & 1) ? size : 0;
int stride = 32 << (dec_count - level); int stride = 32 << (dec_count - level);
int sy = (ori & 2) ? stride >> 1 : 0; int sy = (ori & 2) ? stride >> 1 : 0;
for(i=0; i<size; i++){ for (i = 0; i < size; i++)
for (j = 0; j < size; j++) { for (j = 0; j < size; j++) {
int v= tmp[sx + sy + i*stride + j] * scale[type][dec_count-3][level][ori]; int v = tmp[sx + sy + i * stride + j] *
scale[type][dec_count - 3][level][ori];
s += FFABS(v); s += FFABS(v);
} }
} }
}
}
assert(s >= 0); assert(s >= 0);
return s >> 9; return s >> 9;
} }
static int w53_8_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h){ 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); 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){ 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); 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){ 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); 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){ 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); 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){ 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); 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){ 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); return w_c(v, pix1, pix2, line_size, 32, h, 0);
} }
@ -842,7 +978,8 @@ void ff_dwt_init(DWTContext *c)
c->horizontal_compose97i = ff_snow_horizontal_compose97i; c->horizontal_compose97i = ff_snow_horizontal_compose97i;
c->inner_add_yblock = ff_snow_inner_add_yblock; c->inner_add_yblock = ff_snow_inner_add_yblock;
if (HAVE_MMX) ff_dwt_init_x86(c); if (HAVE_MMX)
ff_dwt_init_x86(c);
} }

46
libavcodec/dwt.h
View File

@ -39,7 +39,8 @@ typedef struct {
int y; int y;
} DWTCompose; } DWTCompose;
/** Used to minimize the amount of memory used in order to optimize cache performance. **/ /** Used to minimize the amount of memory used in order to
* optimize cache performance. **/
typedef struct slice_buffer_s { typedef struct slice_buffer_s {
IDWTELEM **line; ///< For use by idwt and predict_slices. IDWTELEM **line; ///< For use by idwt and predict_slices.
IDWTELEM **data_stack; ///< Used for internal purposes. IDWTELEM **data_stack; ///< Used for internal purposes.
@ -75,9 +76,14 @@ typedef struct DWTContext {
void (*vertical_compose)(void); ///< one set of lowpass and highpass combined void (*vertical_compose)(void); ///< one set of lowpass and highpass combined
void (*horizontal_compose)(IDWTELEM *b, IDWTELEM *tmp, int width); void (*horizontal_compose)(IDWTELEM *b, IDWTELEM *tmp, int width);
void (*vertical_compose97i)(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, int width); void (*vertical_compose97i)(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5,
int width);
void (*horizontal_compose97i)(IDWTELEM *b, int width); void (*horizontal_compose97i)(IDWTELEM *b, 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); 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);
DWTCompose cs[MAX_DECOMPOSITIONS]; DWTCompose cs[MAX_DECOMPOSITIONS];
} DWTContext; } DWTContext;
@ -217,27 +223,43 @@ void ff_spatial_idwt_slice2(DWTContext *d, int y);
#define W_DS 9 #define W_DS 9
#endif #endif
#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))) #define slice_buffer_get_line(slice_buf, line_num) \
//#define slice_buffer_get_line(slice_buf, line_num) (ff_slice_buffer_load_line((slice_buf), (line_num))) ((slice_buf)->line[line_num] ? (slice_buf)->line[line_num] \
: ff_slice_buffer_load_line((slice_buf), \
(line_num)))
void ff_slice_buffer_init(slice_buffer * buf, int line_count, int max_allocated_lines, int line_width, IDWTELEM * base_buffer); void 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_release(slice_buffer *buf, int line);
void ff_slice_buffer_flush(slice_buffer *buf); void ff_slice_buffer_flush(slice_buffer *buf);
void ff_slice_buffer_destroy(slice_buffer *buf); void ff_slice_buffer_destroy(slice_buffer *buf);
IDWTELEM *ff_slice_buffer_load_line(slice_buffer *buf, int line); 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_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5,
int width);
void ff_snow_horizontal_compose97i(IDWTELEM *b, int width); void ff_snow_horizontal_compose97i(IDWTELEM *b, 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); 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_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); 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 width, int height, int stride, int type, int decomposition_count); void ff_spatial_dwt(int *buffer, 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_init(DWTCompose *cs, slice_buffer *sb, int width,
void ff_spatial_idwt_buffered_slice(DWTContext *dsp, DWTCompose *cs, slice_buffer * slice_buf, int width, int height, int stride_line, int type, int decomposition_count, int y); int height, int stride_line, int type,
void ff_spatial_idwt(IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count); int decomposition_count);
void ff_spatial_idwt_buffered_slice(DWTContext *dsp, DWTCompose *cs,
slice_buffer *slice_buf, int width,
int height, int stride_line, int type,
int decomposition_count, int y);
void ff_spatial_idwt(IDWTELEM *buffer, int width, int height, int stride,
int type, int decomposition_count);
void ff_dwt_init(DWTContext *c); void ff_dwt_init(DWTContext *c);
void ff_dwt_init_x86(DWTContext *c); void ff_dwt_init_x86(DWTContext *c);

13
libavformat/avformat.h
View File

@ -351,11 +351,17 @@ typedef struct AVProbeData {
#define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fallback to generic search */ #define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fallback to generic search */
#define AVFMT_NO_BYTE_SEEK 0x8000 /**< Format does not allow seeking by bytes */ #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_ALLOW_FLUSH 0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
#define AVFMT_SEEK_TO_PTS 0x4000000 /**< Seeking is based on PTS */ #if LIBAVFORMAT_VERSION_MAJOR <= 54
#define AVFMT_TS_NONSTRICT 0x8000000 /**< Format does not require strictly #define AVFMT_TS_NONSTRICT 0x8020000 //we try to be compatible to the ABIs of ffmpeg and major forks
#else
#define AVFMT_TS_NONSTRICT 0x20000
#endif
/**< Format does not require strictly
increasing timestamps, but they must increasing timestamps, but they must
still be monotonic */ still be monotonic */
#define AVFMT_SEEK_TO_PTS 0x4000000 /**< Seeking is based on PTS */
/** /**
* @addtogroup lavf_encoding * @addtogroup lavf_encoding
* @{ * @{
@ -377,7 +383,8 @@ typedef struct AVOutputFormat {
/** /**
* can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE, * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE,
* AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS, * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS,
* AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH,
* AVFMT_TS_NONSTRICT
*/ */
int flags; int flags;

3
libavformat/flvenc.c
View File

@ -520,5 +520,6 @@ AVOutputFormat ff_flv_muxer = {
.codec_tag = (const AVCodecTag* const []){ .codec_tag = (const AVCodecTag* const []){
flv_video_codec_ids, flv_audio_codec_ids, 0 flv_video_codec_ids, flv_audio_codec_ids, 0
}, },
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS |
AVFMT_TS_NONSTRICT,
}; };

72
libavformat/http.c
View File

@ -327,13 +327,35 @@ static inline int has_header(const char *str, const char *header)
return av_stristart(str, header + 2, NULL) || av_stristr(str, header); return av_stristart(str, header + 2, NULL) || av_stristr(str, header);
} }
static int http_read_header(URLContext *h, int *new_location)
{
HTTPContext *s = h->priv_data;
char line[1024];
int err = 0;
for (;;) {
if (http_get_line(s, line, sizeof(line)) < 0)
return AVERROR(EIO);
av_dlog(NULL, "header='%s'\n", line);
err = process_line(h, line, s->line_count, new_location);
if (err < 0)
return err;
if (err == 0)
break;
s->line_count++;
}
return err;
}
static int http_connect(URLContext *h, const char *path, const char *local_path, static int http_connect(URLContext *h, const char *path, const char *local_path,
const char *hoststr, const char *auth, const char *hoststr, const char *auth,
const char *proxyauth, int *new_location) const char *proxyauth, int *new_location)
{ {
HTTPContext *s = h->priv_data; HTTPContext *s = h->priv_data;
int post, err; int post, err;
char line[1024];
char headers[1024] = ""; char headers[1024] = "";
char *authstr = NULL, *proxyauthstr = NULL; char *authstr = NULL, *proxyauthstr = NULL;
int64_t off = s->off; int64_t off = s->off;
@ -407,19 +429,9 @@ static int http_connect(URLContext *h, const char *path, const char *local_path,
s->chunksize = -1; s->chunksize = -1;
/* wait for header */ /* wait for header */
for(;;) { err = http_read_header(h, new_location);
if (http_get_line(s, line, sizeof(line)) < 0)
return AVERROR(EIO);
av_dlog(NULL, "header='%s'\n", line);
err = process_line(h, line, s->line_count, new_location);
if (err < 0) if (err < 0)
return err; return err;
if (err == 0)
break;
s->line_count++;
}
return (off == s->off) ? 0 : -1; return (off == s->off) ? 0 : -1;
} }
@ -607,10 +619,11 @@ static int http_proxy_open(URLContext *h, const char *uri, int flags)
HTTPContext *s = h->priv_data; HTTPContext *s = h->priv_data;
char hostname[1024], hoststr[1024]; char hostname[1024], hoststr[1024];
char auth[1024], pathbuf[1024], *path; char auth[1024], pathbuf[1024], *path;
char line[1024], lower_url[100]; char lower_url[100];
int port, ret = 0, attempts = 0; int port, ret = 0, attempts = 0;
HTTPAuthType cur_auth_type; HTTPAuthType cur_auth_type;
char *authstr; char *authstr;
int new_loc;
h->is_streamed = 1; h->is_streamed = 1;
@ -651,30 +664,19 @@ redo:
s->filesize = -1; s->filesize = -1;
cur_auth_type = s->proxy_auth_state.auth_type; cur_auth_type = s->proxy_auth_state.auth_type;
for (;;) { /* Note: This uses buffering, potentially reading more than the
int new_loc; * HTTP header. If tunneling a protocol where the server starts
// Note: This uses buffering, potentially reading more than the * the conversation, we might buffer part of that here, too.
// HTTP header. If tunneling a protocol where the server starts * Reading that requires using the proper ffurl_read() function
// the conversation, we might buffer part of that here, too. * on this URLContext, not using the fd directly (as the tls
// Reading that requires using the proper ffurl_read() function * protocol does). This shouldn't be an issue for tls though,
// on this URLContext, not using the fd directly (as the tls * since the client starts the conversation there, so there
// protocol does). This shouldn't be an issue for tls though, * is no extra data that we might buffer up here.
// since the client starts the conversation there, so there */
// is no extra data that we might buffer up here. ret = http_read_header(h, &new_loc);
if (http_get_line(s, line, sizeof(line)) < 0) {
ret = AVERROR(EIO);
goto fail;
}
av_dlog(h, "header='%s'\n", line);
ret = process_line(h, line, s->line_count, &new_loc);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
if (ret == 0)
break;
s->line_count++;
}
attempts++; attempts++;
if (s->http_code == 407 && if (s->http_code == 407 &&
(cur_auth_type == HTTP_AUTH_NONE || s->proxy_auth_state.stale) && (cur_auth_type == HTTP_AUTH_NONE || s->proxy_auth_state.stale) &&

8
libavformat/matroskaenc.c
View File

@ -1324,7 +1324,8 @@ AVOutputFormat ff_matroska_muxer = {
.write_header = mkv_write_header, .write_header = mkv_write_header,
.write_packet = mkv_write_packet, .write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer, .write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS |
AVFMT_TS_NONSTRICT,
.subtitle_codec = CODEC_ID_SSA, .subtitle_codec = CODEC_ID_SSA,
.query_codec = mkv_query_codec, .query_codec = mkv_query_codec,
}; };
@ -1342,7 +1343,8 @@ AVOutputFormat ff_webm_muxer = {
.write_header = mkv_write_header, .write_header = mkv_write_header,
.write_packet = mkv_write_packet, .write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer, .write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT, .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS |
AVFMT_TS_NONSTRICT,
}; };
#endif #endif
@ -1362,6 +1364,6 @@ AVOutputFormat ff_matroska_audio_muxer = {
.write_header = mkv_write_header, .write_header = mkv_write_header,
.write_packet = mkv_write_packet, .write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer, .write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER, .flags = AVFMT_GLOBALHEADER | AVFMT_TS_NONSTRICT,
}; };
#endif #endif

2
libavformat/md5enc.c
View File

@ -104,6 +104,6 @@ AVOutputFormat ff_framemd5_muxer = {
.video_codec = CODEC_ID_RAWVIDEO, .video_codec = CODEC_ID_RAWVIDEO,
.write_header = ff_framehash_write_header, .write_header = ff_framehash_write_header,
.write_packet = framemd5_write_packet, .write_packet = framemd5_write_packet,
.flags = AVFMT_VARIABLE_FPS, .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT,
}; };
#endif #endif

2
libavformat/smjpegenc.c
View File

@ -144,6 +144,6 @@ AVOutputFormat ff_smjpeg_muxer = {
.write_header = smjpeg_write_header, .write_header = smjpeg_write_header,
.write_packet = smjpeg_write_packet, .write_packet = smjpeg_write_packet,
.write_trailer = smjpeg_write_trailer, .write_trailer = smjpeg_write_trailer,
.flags = AVFMT_GLOBALHEADER, .flags = AVFMT_GLOBALHEADER | AVFMT_TS_NONSTRICT,
.codec_tag = (const AVCodecTag *const []){ ff_codec_smjpeg_video_tags, ff_codec_smjpeg_audio_tags, 0 }, .codec_tag = (const AVCodecTag *const []){ ff_codec_smjpeg_video_tags, ff_codec_smjpeg_audio_tags, 0 },
}; };

2
libavformat/swfenc.c
View File

@ -513,6 +513,7 @@ AVOutputFormat ff_swf_muxer = {
.write_header = swf_write_header, .write_header = swf_write_header,
.write_packet = swf_write_packet, .write_packet = swf_write_packet,
.write_trailer = swf_write_trailer, .write_trailer = swf_write_trailer,
.flags = AVFMT_TS_NONSTRICT,
}; };
#endif #endif
#if CONFIG_AVM2_MUXER #if CONFIG_AVM2_MUXER
@ -526,5 +527,6 @@ AVOutputFormat ff_avm2_muxer = {
.write_header = swf_write_header, .write_header = swf_write_header,
.write_packet = swf_write_packet, .write_packet = swf_write_packet,
.write_trailer = swf_write_trailer, .write_trailer = swf_write_trailer,
.flags = AVFMT_TS_NONSTRICT,
}; };
#endif #endif

4
libavformat/utils.c
View File

@ -3315,7 +3315,9 @@ static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt){
pkt->dts= st->pts_buffer[0]; pkt->dts= st->pts_buffer[0];
} }
if(st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) && st->cur_dts >= pkt->dts) || st->cur_dts > pkt->dts)){ if (st->cur_dts && st->cur_dts != AV_NOPTS_VALUE &&
((!(s->oformat->flags & AVFMT_TS_NONSTRICT) &&
st->cur_dts >= pkt->dts) || st->cur_dts > pkt->dts)) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Application provided invalid, non monotonically increasing dts to muxer in stream %d: %s >= %s\n", "Application provided invalid, non monotonically increasing dts to muxer in stream %d: %s >= %s\n",
st->index, av_ts2str(st->cur_dts), av_ts2str(pkt->dts)); st->index, av_ts2str(st->cur_dts), av_ts2str(pkt->dts));

4
libavformat/version.h
View File

@ -30,8 +30,8 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MAJOR 54
#define LIBAVFORMAT_VERSION_MINOR 5 #define LIBAVFORMAT_VERSION_MINOR 6
#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \

1
libavformat/wav.c
View File

@ -224,6 +224,7 @@ AVOutputFormat ff_wav_muxer = {
.write_header = wav_write_header, .write_header = wav_write_header,
.write_packet = wav_write_packet, .write_packet = wav_write_packet,
.write_trailer = wav_write_trailer, .write_trailer = wav_write_trailer,
.flags = AVFMT_TS_NONSTRICT,
.codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 }, .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
.priv_class = &wav_muxer_class, .priv_class = &wav_muxer_class,
}; };