schrofilter.h   schrofilter.h 
#ifndef __SCHRO_FILTER_H__ #ifndef __SCHRO_FILTER_H__
#define __SCHRO_FILTER_H__ #define __SCHRO_FILTER_H__
#include <schroedinger/schroframe.h> #include <schroedinger/schroframe.h>
SCHRO_BEGIN_DECLS SCHRO_BEGIN_DECLS
#ifdef SCHRO_ENABLE_UNSTABLE_API #ifdef SCHRO_ENABLE_UNSTABLE_API
void schro_frame_filter_lowpass (SchroFrame *frame); void schro_frame_filter_lowpass (SchroFrame * frame, int tap);
void schro_frame_filter_lowpass2 (SchroFrame *frame, double sigma); void schro_frame_filter_lowpass2 (SchroFrame *frame, double sigma);
void schro_frame_filter_lowpass_16 (SchroFrame *frame); void schro_frame_filter_lowpass_16 (SchroFrame *frame);
void schro_frame_filter_cwm7 (SchroFrame *frame); void schro_frame_filter_cwm7 (SchroFrame *frame);
void schro_frame_filter_cwmN (SchroFrame *frame, int weight); void schro_frame_filter_cwmN (SchroFrame *frame, int weight);
void schro_frame_filter_cwmN_ref (SchroFrame *frame, int weight); void schro_frame_filter_cwmN_ref (SchroFrame *frame, int weight);
void schro_frame_filter_wavelet (SchroFrame *frame); void schro_frame_filter_wavelet (SchroFrame *frame);
void schro_frame_filter_addnoise (SchroFrame *frame, double sigma); void schro_frame_filter_addnoise (SchroFrame *frame, double sigma);
void schro_frame_filter_adaptive_lowpass (SchroFrame *frame); void schro_frame_filter_adaptive_lowpass (SchroFrame *frame);
void schro_filter_cwmN (uint8_t *d, uint8_t *s1, uint8_t *s2, uint8_t *s3, int n, int weight); void schro_filter_cwmN (uint8_t *d, uint8_t *s1, uint8_t *s2, uint8_t *s3, int n, int weight);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 schrometric.h   schrometric.h 
skipping to change at line 12 skipping to change at line 12
#ifndef SCHRO_METRIC_H #ifndef SCHRO_METRIC_H
#define SCHRO_METRIC_H #define SCHRO_METRIC_H
#include <schroedinger/schroutils.h> #include <schroedinger/schroutils.h>
#include <schroedinger/schroframe.h> #include <schroedinger/schroframe.h>
#include <limits.h> #include <limits.h>
SCHRO_BEGIN_DECLS SCHRO_BEGIN_DECLS
typedef struct _SchroMetricScan SchroMetricScan; typedef struct _SchroMetricScan SchroMetricScan;
typedef struct _SchroMetricInfo SchroMetricInfo;
#ifdef SCHRO_ENABLE_UNSTABLE_API #ifdef SCHRO_ENABLE_UNSTABLE_API
#define SCHRO_LIMIT_METRIC_SCAN 42 #define SCHRO_LIMIT_METRIC_SCAN 42
struct _SchroMetricInfo {
SchroFrame *frame;
SchroFrame *ref_frame;
int block_width[3];
int block_height[3];
int h_shift[3];
int v_shift[3];
int (*metric) (SchroMetricInfo *info, int ref_x, int ref_y,
int dx, int dy);
int (*metric_right) (SchroMetricInfo *info, int ref_x, int ref_y,
int dx, int dy);
int (*metric_bottom) (SchroMetricInfo *info, int ref_x, int ref_y,
int dx, int dy);
int (*metric_corner) (SchroMetricInfo *info, int ref_x, int ref_y,
int dx, int dy);
};
struct _SchroMetricScan { struct _SchroMetricScan {
SchroFrame *frame; SchroFrame *frame;
SchroFrame *ref_frame; SchroFrame *ref_frame;
int block_width; int block_width;
int block_height; int block_height;
int x, y; int x, y;
int ref_x, ref_y; int ref_x, ref_y;
int scan_width; int scan_width;
int scan_height; int scan_height;
int gravity_scale; int gravity_scale;
skipping to change at line 57 skipping to change at line 78
, uint32_t* chroma_metric); , uint32_t* chroma_metric);
void schro_metric_scan_setup (SchroMetricScan *scan, int dx, int dy, int di st void schro_metric_scan_setup (SchroMetricScan *scan, int dx, int dy, int di st
, int use_chroma); , int use_chroma);
int schro_metric_get (SchroFrameData *src1, SchroFrameData *src2, int width , int height); int schro_metric_get (SchroFrameData *src1, SchroFrameData *src2, int width , int height);
int schro_metric_get_biref (SchroFrameData *fd, SchroFrameData *src1, int schro_metric_get_biref (SchroFrameData *fd, SchroFrameData *src1,
int weight1, SchroFrameData *src2, int weight2, int shift, int width, int weight1, SchroFrameData *src2, int weight2, int shift, int width,
int height); int height);
int schro_metric_get_dc (SchroFrameData *src, int value, int width, int hei ght); int schro_metric_get_dc (SchroFrameData *src, int value, int width, int hei ght);
void schro_metric_info_init (SchroMetricInfo *info, SchroFrame *frame,
SchroFrame *ref_frame, int block_width, int block_height);
int schro_metric_fast_block (SchroMetricInfo *info, int x, int y,
int dx, int dy);
int schro_metric_fast_subsuperblock (SchroMetricInfo *info, int x, int y,
int dx, int dy);
int schro_metric_fast_superblock (SchroMetricInfo *info, int x, int y,
int dx, int dy);
#endif #endif
SCHRO_END_DECLS SCHRO_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
0 lines changed or deleted 31 lines changed or added


 schroutils.h   schroutils.h 
skipping to change at line 94 skipping to change at line 94
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
#define SCHRO_BEGIN_DECLS extern "C" { #define SCHRO_BEGIN_DECLS extern "C" {
#define SCHRO_END_DECLS } #define SCHRO_END_DECLS }
#else #else
#define SCHRO_BEGIN_DECLS #define SCHRO_BEGIN_DECLS
#define SCHRO_END_DECLS #define SCHRO_END_DECLS
#endif #endif
#if SCHRO_GNUC_PREREQ(3,0) && defined(__OPTIMIZE__)
#define SCHRO_LIKELY(expr) (__builtin_expect ((expr), 1))
#define SCHRO_UNLIKELY(expr) (__builtin_expect ((expr), 0))
#else
#define SCHRO_LIKELY(expr) (expr)
#define SCHRO_UNLIKELY(expr) (expr)
#endif
SCHRO_BEGIN_DECLS SCHRO_BEGIN_DECLS
#ifdef SCHRO_ENABLE_UNSTABLE_API #ifdef SCHRO_ENABLE_UNSTABLE_API
void * schro_malloc (int size); void * schro_malloc (int size);
void * schro_malloc0 (int size); void * schro_malloc0 (int size);
void * schro_realloc (void *ptr, int size); void * schro_realloc (void *ptr, int size);
void schro_free (void *ptr); void schro_free (void *ptr);
int muldiv64 (int a, int b, int c); int muldiv64 (int a, int b, int c);
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 schroversion.h   schroversion.h 
#ifndef __SCHRO_VERSION_H__ #ifndef __SCHRO_VERSION_H__
#define __SCHRO_VERSION_H__ #define __SCHRO_VERSION_H__
#define SCHRO_VERSION_MAJOR (1) #define SCHRO_VERSION_MAJOR (1)
#define SCHRO_VERSION_MINOR (0) #define SCHRO_VERSION_MINOR (0)
#define SCHRO_VERSION_MICRO (9) #define SCHRO_VERSION_MICRO (10)
#define SCHRO_CHECK_VERSION(major,minor,micro) \ #define SCHRO_CHECK_VERSION(major,minor,micro) \
(SCHRO_VERSION_MAJOR > (major) || \ (SCHRO_VERSION_MAJOR > (major) || \
(SCHRO_VERSION_MAJOR == (major) && SCHRO_VERSION_MINOR > (minor)) || \ (SCHRO_VERSION_MAJOR == (major) && SCHRO_VERSION_MINOR > (minor)) || \
(SCHRO_VERSION_MAJOR == (major) && SCHRO_VERSION_MINOR == (minor) && \ (SCHRO_VERSION_MAJOR == (major) && SCHRO_VERSION_MINOR == (minor) && \
SCHRO_VERSION_MICRO >= (micro))) SCHRO_VERSION_MICRO >= (micro)))
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/