Browse code
Merge commit 'b5b7b75e91e291c810ebd01868a42b53f267a87c'
* commit 'b5b7b75e91e291c810ebd01868a42b53f267a87c':
dsputil: Move get_penalty_factor() to the only place it is used.
Conflicts:
libavcodec/dsputil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer authored on 2013/02/09 20:05:53Showing 3 changed files
| ... | ... |
@@ -479,30 +479,6 @@ static inline uint64_t no_rnd_avg64(uint64_t a, uint64_t b) |
| 479 | 479 |
return (a & b) + (((a ^ b) & ~BYTE_VEC64(0x01)) >> 1); |
| 480 | 480 |
} |
| 481 | 481 |
|
| 482 |
-static inline int get_penalty_factor(int lambda, int lambda2, int type){
|
|
| 483 |
- switch(type&0xFF){
|
|
| 484 |
- default: |
|
| 485 |
- case FF_CMP_SAD: |
|
| 486 |
- return lambda>>FF_LAMBDA_SHIFT; |
|
| 487 |
- case FF_CMP_DCT: |
|
| 488 |
- return (3*lambda)>>(FF_LAMBDA_SHIFT+1); |
|
| 489 |
- case FF_CMP_W53: |
|
| 490 |
- return (4*lambda)>>(FF_LAMBDA_SHIFT); |
|
| 491 |
- case FF_CMP_W97: |
|
| 492 |
- return (2*lambda)>>(FF_LAMBDA_SHIFT); |
|
| 493 |
- case FF_CMP_SATD: |
|
| 494 |
- case FF_CMP_DCT264: |
|
| 495 |
- return (2*lambda)>>FF_LAMBDA_SHIFT; |
|
| 496 |
- case FF_CMP_RD: |
|
| 497 |
- case FF_CMP_PSNR: |
|
| 498 |
- case FF_CMP_SSE: |
|
| 499 |
- case FF_CMP_NSSE: |
|
| 500 |
- return lambda2>>FF_LAMBDA_SHIFT; |
|
| 501 |
- case FF_CMP_BIT: |
|
| 502 |
- return 1; |
|
| 503 |
- } |
|
| 504 |
-} |
|
| 505 |
- |
|
| 506 | 482 |
void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx); |
| 507 | 483 |
void ff_dsputil_init_arm(DSPContext* c, AVCodecContext *avctx); |
| 508 | 484 |
void ff_dsputil_init_bfin(DSPContext* c, AVCodecContext *avctx); |
| ... | ... |
@@ -987,6 +987,30 @@ static inline int check_input_motion(MpegEncContext * s, int mb_x, int mb_y, int |
| 987 | 987 |
return d; |
| 988 | 988 |
} |
| 989 | 989 |
|
| 990 |
+static inline int get_penalty_factor(int lambda, int lambda2, int type){
|
|
| 991 |
+ switch(type&0xFF){
|
|
| 992 |
+ default: |
|
| 993 |
+ case FF_CMP_SAD: |
|
| 994 |
+ return lambda>>FF_LAMBDA_SHIFT; |
|
| 995 |
+ case FF_CMP_DCT: |
|
| 996 |
+ return (3*lambda)>>(FF_LAMBDA_SHIFT+1); |
|
| 997 |
+ case FF_CMP_W53: |
|
| 998 |
+ return (4*lambda)>>(FF_LAMBDA_SHIFT); |
|
| 999 |
+ case FF_CMP_W97: |
|
| 1000 |
+ return (2*lambda)>>(FF_LAMBDA_SHIFT); |
|
| 1001 |
+ case FF_CMP_SATD: |
|
| 1002 |
+ case FF_CMP_DCT264: |
|
| 1003 |
+ return (2*lambda)>>FF_LAMBDA_SHIFT; |
|
| 1004 |
+ case FF_CMP_RD: |
|
| 1005 |
+ case FF_CMP_PSNR: |
|
| 1006 |
+ case FF_CMP_SSE: |
|
| 1007 |
+ case FF_CMP_NSSE: |
|
| 1008 |
+ return lambda2>>FF_LAMBDA_SHIFT; |
|
| 1009 |
+ case FF_CMP_BIT: |
|
| 1010 |
+ return 1; |
|
| 1011 |
+ } |
|
| 1012 |
+} |
|
| 1013 |
+ |
|
| 990 | 1014 |
void ff_estimate_p_frame_motion(MpegEncContext * s, |
| 991 | 1015 |
int mb_x, int mb_y) |
| 992 | 1016 |
{
|
| ... | ... |
@@ -287,6 +287,30 @@ static int pix_norm1(uint8_t * pix, int line_size, int w) |
| 287 | 287 |
return s; |
| 288 | 288 |
} |
| 289 | 289 |
|
| 290 |
+static inline int get_penalty_factor(int lambda, int lambda2, int type){
|
|
| 291 |
+ switch(type&0xFF){
|
|
| 292 |
+ default: |
|
| 293 |
+ case FF_CMP_SAD: |
|
| 294 |
+ return lambda>>FF_LAMBDA_SHIFT; |
|
| 295 |
+ case FF_CMP_DCT: |
|
| 296 |
+ return (3*lambda)>>(FF_LAMBDA_SHIFT+1); |
|
| 297 |
+ case FF_CMP_W53: |
|
| 298 |
+ return (4*lambda)>>(FF_LAMBDA_SHIFT); |
|
| 299 |
+ case FF_CMP_W97: |
|
| 300 |
+ return (2*lambda)>>(FF_LAMBDA_SHIFT); |
|
| 301 |
+ case FF_CMP_SATD: |
|
| 302 |
+ case FF_CMP_DCT264: |
|
| 303 |
+ return (2*lambda)>>FF_LAMBDA_SHIFT; |
|
| 304 |
+ case FF_CMP_RD: |
|
| 305 |
+ case FF_CMP_PSNR: |
|
| 306 |
+ case FF_CMP_SSE: |
|
| 307 |
+ case FF_CMP_NSSE: |
|
| 308 |
+ return lambda2>>FF_LAMBDA_SHIFT; |
|
| 309 |
+ case FF_CMP_BIT: |
|
| 310 |
+ return 1; |
|
| 311 |
+ } |
|
| 312 |
+} |
|
| 313 |
+ |
|
| 290 | 314 |
//FIXME copy&paste |
| 291 | 315 |
#define P_LEFT P[1] |
| 292 | 316 |
#define P_TOP P[2] |