Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

cosmetics: Fix indentation to be 4 spaces and consistently place {}.

Browse Source 
Originally committed as revision 12552 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Diego Biurrun 17 years ago
parent b19221c8ce
commit 16e0bf7349
5 changed files with 4706 additions and 4838 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1337
      libpostproc/postprocess.c
  2. 8
      libpostproc/postprocess.h
  3. 1915
      libpostproc/postprocess_altivec_template.c
  4. 135
      libpostproc/postprocess_internal.h
  5. 6149
      libpostproc/postprocess_template.c

1337
libpostproc/postprocess.c
View File

File diff suppressed because it is too large Load Diff

8
libpostproc/postprocess.h
Unescape View File

@ -59,10 +59,10 @@ extern const char pp_help[]; ///< a simple help text
#endif #endif
void pp_postprocess(const uint8_t * src[3], const int srcStride[3], void pp_postprocess(const uint8_t * src[3], const int srcStride[3],
uint8_t * dst[3], const int dstStride[3], uint8_t * dst[3], const int dstStride[3],
int horizontalSize, int verticalSize, int horizontalSize, int verticalSize,
const QP_STORE_T *QP_store, int QP_stride, const QP_STORE_T *QP_store, int QP_stride,
pp_mode_t *mode, pp_context_t *ppContext, int pict_type); pp_mode_t *mode, pp_context_t *ppContext, int pict_type);
/** /**

1915
libpostproc/postprocess_altivec_template.c
View File

File diff suppressed because it is too large Load Diff

135
libpostproc/postprocess_internal.h
Unescape View File

@ -55,13 +55,13 @@
#define FULL_Y_RANGE 0x8000 // 32768 #define FULL_Y_RANGE 0x8000 // 32768
//Deinterlacing Filters //Deinterlacing Filters
#define LINEAR_IPOL_DEINT_FILTER 0x10000 // 65536 #define LINEAR_IPOL_DEINT_FILTER 0x10000 // 65536
#define LINEAR_BLEND_DEINT_FILTER 0x20000 // 131072 #define LINEAR_BLEND_DEINT_FILTER 0x20000 // 131072
#define CUBIC_BLEND_DEINT_FILTER 0x8000 // (not implemented yet) #define CUBIC_BLEND_DEINT_FILTER 0x8000 // (not implemented yet)
#define CUBIC_IPOL_DEINT_FILTER 0x40000 // 262144 #define CUBIC_IPOL_DEINT_FILTER 0x40000 // 262144
#define MEDIAN_DEINT_FILTER 0x80000 // 524288 #define MEDIAN_DEINT_FILTER 0x80000 // 524288
#define FFMPEG_DEINT_FILTER 0x400000 #define FFMPEG_DEINT_FILTER 0x400000
#define LOWPASS5_DEINT_FILTER 0x800000 #define LOWPASS5_DEINT_FILTER 0x800000
#define TEMP_NOISE_FILTER 0x100000 #define TEMP_NOISE_FILTER 0x100000
#define FORCE_QUANT 0x200000 #define FORCE_QUANT 0x200000
@ -73,106 +73,105 @@
//#define COMPILE_TIME_MODE 0x77 //#define COMPILE_TIME_MODE 0x77
static inline int CLIP(int a){ static inline int CLIP(int a){
if(a&256) return ((a)>>31)^(-1); if(a&256) return ((a)>>31)^(-1);
else return a; else return a;
} }
/** /**
* Postprocessng filter. * Postprocessng filter.
*/ */
struct PPFilter{ struct PPFilter{
const char *shortName; const char *shortName;
const char *longName; const char *longName;
int chromDefault; ///< is chrominance filtering on by default if this filter is manually activated int chromDefault; ///< is chrominance filtering on by default if this filter is manually activated
int minLumQuality; ///< minimum quality to turn luminance filtering on int minLumQuality; ///< minimum quality to turn luminance filtering on
int minChromQuality; ///< minimum quality to turn chrominance filtering on int minChromQuality; ///< minimum quality to turn chrominance filtering on
int mask; ///< Bitmask to turn this filter on int mask; ///< Bitmask to turn this filter on
}; };
/** /**
* Postprocessng mode. * Postprocessng mode.
*/ */
typedef struct PPMode{ typedef struct PPMode{
int lumMode; ///< acivates filters for luminance int lumMode; ///< acivates filters for luminance
int chromMode; ///< acivates filters for chrominance int chromMode; ///< acivates filters for chrominance
int error; ///< non zero on error int error; ///< non zero on error
int minAllowedY; ///< for brigtness correction int minAllowedY; ///< for brigtness correction
int maxAllowedY; ///< for brihtness correction int maxAllowedY; ///< for brihtness correction
float maxClippedThreshold; ///< amount of "black" u r willing to loose to get a brightness corrected picture float maxClippedThreshold; ///< amount of "black" u r willing to loose to get a brightness corrected picture
int maxTmpNoise[3]; ///< for Temporal Noise Reducing filter (Maximal sum of abs differences) int maxTmpNoise[3]; ///< for Temporal Noise Reducing filter (Maximal sum of abs differences)
int baseDcDiff; int baseDcDiff;
int flatnessThreshold; int flatnessThreshold;
int forcedQuant; ///< quantizer if FORCE_QUANT is used int forcedQuant; ///< quantizer if FORCE_QUANT is used
} PPMode; } PPMode;
/** /**
* postprocess context. * postprocess context.
*/ */
typedef struct PPContext{ typedef struct PPContext{
/** /**
* info on struct for av_log * info on struct for av_log
*/ */
const AVClass *av_class; const AVClass *av_class;
uint8_t *tempBlocks; ///<used for the horizontal code uint8_t *tempBlocks; ///<used for the horizontal code
/** /**
* luma histogram. * luma histogram.
* we need 64bit here otherwise we'll going to have a problem * we need 64bit here otherwise we'll going to have a problem
* after watching a black picture for 5 hours * after watching a black picture for 5 hours
*/ */
uint64_t *yHistogram; uint64_t *yHistogram;
DECLARE_ALIGNED(8, uint64_t, packedYOffset); DECLARE_ALIGNED(8, uint64_t, packedYOffset);
DECLARE_ALIGNED(8, uint64_t, packedYScale); DECLARE_ALIGNED(8, uint64_t, packedYScale);
/** Temporal noise reducing buffers */ /** Temporal noise reducing buffers */
uint8_t *tempBlured[3]; uint8_t *tempBlured[3];
int32_t *tempBluredPast[3]; int32_t *tempBluredPast[3];
/** Temporary buffers for handling the last row(s) */ /** Temporary buffers for handling the last row(s) */
uint8_t *tempDst; uint8_t *tempDst;
uint8_t *tempSrc; uint8_t *tempSrc;
uint8_t *deintTemp; uint8_t *deintTemp;
DECLARE_ALIGNED(8, uint64_t, pQPb); DECLARE_ALIGNED(8, uint64_t, pQPb);
DECLARE_ALIGNED(8, uint64_t, pQPb2); DECLARE_ALIGNED(8, uint64_t, pQPb2);
DECLARE_ALIGNED(8, uint64_t, mmxDcOffset[64]); DECLARE_ALIGNED(8, uint64_t, mmxDcOffset[64]);
DECLARE_ALIGNED(8, uint64_t, mmxDcThreshold[64]); DECLARE_ALIGNED(8, uint64_t, mmxDcThreshold[64]);
QP_STORE_T *stdQPTable; ///< used to fix MPEG2 style qscale QP_STORE_T *stdQPTable; ///< used to fix MPEG2 style qscale
QP_STORE_T *nonBQPTable; QP_STORE_T *nonBQPTable;
QP_STORE_T *forcedQPTable; QP_STORE_T *forcedQPTable;
int QP; int QP;
int nonBQP; int nonBQP;
int frameNum; int frameNum;
int cpuCaps; int cpuCaps;
int qpStride; ///<size of qp buffers (needed to realloc them if needed) int qpStride; ///<size of qp buffers (needed to realloc them if needed)
int stride; ///<size of some buffers (needed to realloc them if needed) int stride; ///<size of some buffers (needed to realloc them if needed)
int hChromaSubSample; int hChromaSubSample;
int vChromaSubSample; int vChromaSubSample;
PPMode ppMode; PPMode ppMode;
} PPContext; } PPContext;
static inline void linecpy(void *dest, const void *src, int lines, int stride) static inline void linecpy(void *dest, const void *src, int lines, int stride) {
{ if (stride > 0) {
if (stride > 0) { memcpy(dest, src, lines*stride);
memcpy(dest, src, lines*stride); } else {
} else { memcpy((uint8_t*)dest+(lines-1)*stride, (const uint8_t*)src+(lines-1)*stride, -lines*stride);
memcpy((uint8_t*)dest+(lines-1)*stride, (const uint8_t*)src+(lines-1)*stride, -lines*stride); }
}
} }
#endif /* FFMPEG_POSTPROCESS_INTERNAL_H */ #endif /* FFMPEG_POSTPROCESS_INTERNAL_H */

6149
libpostproc/postprocess_template.c
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save