diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 04:46:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 04:46:13 +0200 |
| commit | 633b90ca8d5fbdac4e54b0d6b054e273b3a5efa5 (patch) | |
| tree | 9c351711a68105bf554ee1153b0e4c59f9dae87a | |
| parent | 969267482de97b08503d27d2fe090ec820273e40 (diff) | |
| parent | 0db9eba48c8a27bc2373d02edda3340ef6f0e5fc (diff) | |
| download | ffmpeg-633b90ca8d5fbdac4e54b0d6b054e273b3a5efa5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
motion_est: drop inline from sad_hpel_motion_search()
motion_est: remove unused macros
motion_est: remove useless no_motion_search() function
lagarith: frame multithreading
doxygen: qdm2: Drop documentation for non-existing function parameters
build: add HOSTOBJS to SUBDIR_VARS list
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/motion_est.c | 25 | ||||
| -rw-r--r-- | libavcodec/qdm2.c | 2 |
3 files changed, 7 insertions, 22 deletions
@@ -73,7 +73,7 @@ SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ MMI-OBJS ALTIVEC-OBJS VIS-OBJS \ MMX-OBJS YASM-OBJS \ MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSPR1-OBJS MIPS32R2-OBJS \ - OBJS TESTOBJS + OBJS HOSTOBJS TESTOBJS define RESET $(1) := diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 2d0b602ece..d06080345b 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -39,15 +39,13 @@ #undef NDEBUG #include <assert.h> -#define SQ(a) ((a)*(a)) - #define P_LEFT P[1] #define P_TOP P[2] #define P_TOPRIGHT P[3] #define P_MEDIAN P[4] #define P_MV1 P[9] -static inline int sad_hpel_motion_search(MpegEncContext * s, +static int sad_hpel_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, int dmin, int src_index, int ref_index, int size, int h); @@ -374,15 +372,6 @@ int ff_init_me(MpegEncContext *s){ return 0; } -static inline void no_motion_search(MpegEncContext * s, - int *mx_ptr, int *my_ptr) -{ - *mx_ptr = 16 * s->mb_x; - *my_ptr = 16 * s->mb_y; -} - -#define Z_THRESHOLD 256 - #define CHECK_SAD_HALF_MV(suffix, x, y) \ {\ d= s->dsp.pix_abs[size][(x?1:0)+(y?2:0)](NULL, pix, ptr+((x)>>1), stride, h);\ @@ -390,7 +379,7 @@ static inline void no_motion_search(MpegEncContext * s, COPY3_IF_LT(dminh, d, dx, x, dy, y)\ } -static inline int sad_hpel_motion_search(MpegEncContext * s, +static int sad_hpel_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, int dmin, int src_index, int ref_index, int size, int h) @@ -1051,9 +1040,8 @@ void ff_estimate_p_frame_motion(MpegEncContext * s, switch(s->me_method) { case ME_ZERO: default: - no_motion_search(s, &mx, &my); - mx-= mb_x*16; - my-= mb_y*16; + mx = 0; + my = 0; dmin = 0; break; case ME_X1: @@ -1294,10 +1282,9 @@ static int ff_estimate_motion_b(MpegEncContext * s, switch(s->me_method) { case ME_ZERO: default: - no_motion_search(s, &mx, &my); + mx = 0; + my = 0; dmin = 0; - mx-= mb_x*16; - my-= mb_y*16; break; case ME_X1: case ME_EPZS: diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index dd13c6ecc9..3a77e7fe06 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -1105,7 +1105,6 @@ static int process_subpacket_9 (QDM2Context *q, QDM2SubPNode *node) * * @param q context * @param node pointer to node with packet - * @param length packet length in bits */ static void process_subpacket_10 (QDM2Context *q, QDM2SubPNode *node) { @@ -1154,7 +1153,6 @@ static void process_subpacket_11 (QDM2Context *q, QDM2SubPNode *node) * * @param q context * @param node pointer to node with packet - * @param length packet length in bits */ static void process_subpacket_12 (QDM2Context *q, QDM2SubPNode *node) { |