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

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
  dsputil: remove disabled code
  tta: remove disabled code
  gxfenc: place variable declarations before statements
  x86: Use LOCAL_ALIGNED in mpegvideo_mmx_template
  random_seed: use proper #includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/2/head
Michael Niedermayer 14 years ago
parent 93263dc19e 9bc8bcddbd
commit 3c3daf4d19
6 changed files with 5 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      libavcodec/dsputil.c
  2. 31
      libavcodec/tta.c
  3. 39
      libavcodec/x86/dsputil_mmx.c
  4. 2
      libavcodec/x86/mpegvideo_mmx_template.c
  5. 3
      libavformat/gxfenc.c
  6. 4
      libavutil/random_seed.c

32
libavcodec/dsputil.c
Unescape View File

@ -174,16 +174,6 @@ static int pix_norm1_c(uint8_t * pix, int line_size)
s = 0;
for (i = 0; i < 16; i++) {
for (j = 0; j < 16; j += 8) {
#if 0
s += sq[pix[0]];
s += sq[pix[1]];
s += sq[pix[2]];
s += sq[pix[3]];
s += sq[pix[4]];
s += sq[pix[5]];
s += sq[pix[6]];
s += sq[pix[7]];
#else
#if LONG_MAX > 2147483647
register uint64_t x=*(uint64_t*)pix;
s += sq[x&0xff];
@ -205,7 +195,6 @@ static int pix_norm1_c(uint8_t * pix, int line_size)
s += sq[(x>>8)&0xff];
s += sq[(x>>16)&0xff];
s += sq[(x>>24)&0xff];
#endif
#endif
pix += 8;
}
@ -818,27 +807,6 @@ static inline void avg_tpel_pixels_mc22_c(uint8_t *dst, const uint8_t *src, int
dst += stride;
}
}
#if 0
#define TPEL_WIDTH(width)\
static void put_tpel_pixels ## width ## _mc00_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
void put_tpel_pixels_mc00_c(dst, src, stride, width, height);}\
static void put_tpel_pixels ## width ## _mc10_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
void put_tpel_pixels_mc10_c(dst, src, stride, width, height);}\
static void put_tpel_pixels ## width ## _mc20_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
void put_tpel_pixels_mc20_c(dst, src, stride, width, height);}\
static void put_tpel_pixels ## width ## _mc01_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
void put_tpel_pixels_mc01_c(dst, src, stride, width, height);}\
static void put_tpel_pixels ## width ## _mc11_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
void put_tpel_pixels_mc11_c(dst, src, stride, width, height);}\
static void put_tpel_pixels ## width ## _mc21_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
void put_tpel_pixels_mc21_c(dst, src, stride, width, height);}\
static void put_tpel_pixels ## width ## _mc02_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
void put_tpel_pixels_mc02_c(dst, src, stride, width, height);}\
static void put_tpel_pixels ## width ## _mc12_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
void put_tpel_pixels_mc12_c(dst, src, stride, width, height);}\
static void put_tpel_pixels ## width ## _mc22_c(uint8_t *dst, const uint8_t *src, int stride, int height){\
void put_tpel_pixels_mc22_c(dst, src, stride, width, height);}
#endif
#define QPEL_MC(r, OPNAME, RND, OP) \
static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\

31
libavcodec/tta.c
Unescape View File

@ -66,23 +66,6 @@ typedef struct TTAContext {
TTAChannel *ch_ctx;
} TTAContext;
#if 0
static inline int shift_1(int i)
{
if (i < 32)
return 1 << i;
else
return 0x80000000; // 16 << 31
}
static inline int shift_16(int i)
{
if (i < 28)
return 16 << i;
else
return 0x80000000; // 16 << 27
}
#else
static const uint32_t shift_1[] = {
0x00000001, 0x00000002, 0x00000004, 0x00000008,
0x00000010, 0x00000020, 0x00000040, 0x00000080,
@ -97,7 +80,6 @@ static const uint32_t shift_1[] = {
};
static const uint32_t * const shift_16 = shift_1 + 4;
#endif
static const int32_t ttafilter_configs[4][2] = {
{10, 1},
@ -403,19 +385,6 @@ static int tta_decode_frame(AVCodecContext *avctx,
}
*predictor = *p;
#if 0
// extract 32bit float from last two int samples
if (s->is_float && ((p - data) & 1)) {
uint32_t neg = *p & 0x80000000;
uint32_t hi = *(p - 1);
uint32_t lo = abs(*p) - 1;
hi += (hi || lo) ? 0x3f80 : 0;
// SWAP16: swap all the 16 bits
*(p - 1) = (hi << 16) | SWAP16(lo) | neg;
}
#endif
/*if ((get_bits_count(&s->gb)+7)/8 > buf_size)
{
av_log(NULL, AV_LOG_INFO, "overread!!\n");

39
libavcodec/x86/dsputil_mmx.c
Unescape View File

@ -1569,10 +1569,6 @@ QPEL_2TAP(put_, 8, 3dnow)
QPEL_2TAP(avg_, 8, 3dnow)
#if 0
static void just_return(void) { return; }
#endif
#if HAVE_YASM
typedef void emu_edge_core_func (uint8_t *buf, const uint8_t *src,
x86_reg linesize, x86_reg start_y,
@ -2852,39 +2848,4 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
if (CONFIG_ENCODERS)
dsputilenc_init_mmx(c, avctx);
#if 0
// for speed testing
get_pixels = just_return;
put_pixels_clamped = just_return;
add_pixels_clamped = just_return;
pix_abs16x16 = just_return;
pix_abs16x16_x2 = just_return;
pix_abs16x16_y2 = just_return;
pix_abs16x16_xy2 = just_return;
put_pixels_tab[0] = just_return;
put_pixels_tab[1] = just_return;
put_pixels_tab[2] = just_return;
put_pixels_tab[3] = just_return;
put_no_rnd_pixels_tab[0] = just_return;
put_no_rnd_pixels_tab[1] = just_return;
put_no_rnd_pixels_tab[2] = just_return;
put_no_rnd_pixels_tab[3] = just_return;
avg_pixels_tab[0] = just_return;
avg_pixels_tab[1] = just_return;
avg_pixels_tab[2] = just_return;
avg_pixels_tab[3] = just_return;
avg_no_rnd_pixels_tab[0] = just_return;
avg_no_rnd_pixels_tab[1] = just_return;
avg_no_rnd_pixels_tab[2] = just_return;
avg_no_rnd_pixels_tab[3] = just_return;
//av_fdct = just_return;
//ff_idct = just_return;
#endif
}

2
libavcodec/x86/mpegvideo_mmx_template.c
Unescape View File

@ -98,7 +98,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s,
x86_reg last_non_zero_p1;
int level=0, q; //=0 is because gcc says uninitialized ...
const uint16_t *qmat, *bias;
DECLARE_ALIGNED(16, int16_t, temp_block)[64];
LOCAL_ALIGNED_16(int16_t, temp_block, [64]);
assert((7&(int)(&temp_block[0])) == 0); //did gcc align it correctly?

3
libavformat/gxfenc.c
Unescape View File

@ -396,6 +396,7 @@ static int gxf_write_umf_material_description(AVFormatContext *s)
int timecode_base = gxf->time_base.den == 60000 ? 60 : 50;
int64_t timestamp = 0;
AVDictionaryEntry *t;
uint32_t timecode;
#if FF_API_TIMESTAMP
if (s->timestamp)
@ -406,7 +407,7 @@ static int gxf_write_umf_material_description(AVFormatContext *s)
timestamp = ff_iso8601_to_unix_time(t->value);
// XXX drop frame
uint32_t timecode =
timecode =
gxf->nb_fields / (timecode_base * 3600) % 24 << 24 | // hours
gxf->nb_fields / (timecode_base * 60) % 60 << 16 | // minutes
gxf->nb_fields / timecode_base % 60 << 8 | // seconds

4
libavutil/random_seed.c
Unescape View File

@ -20,10 +20,10 @@
#include <unistd.h>
#include <fcntl.h>
#include <math.h>
#include <time.h>
#include "timer.h"
#include "time.h"
#include "random_seed.h"
#include "avutil.h"
static int read_random(uint32_t *dst, const char *file)
{

Write Preview
Loading…
Cancel
Save