... | ... |
@@ -1119,10 +1119,8 @@ void ff_estimate_p_frame_motion(MpegEncContext * s, |
1119 | 1119 |
// pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin; |
1120 | 1120 |
c->mc_mb_var_sum_temp += (vard+128)>>8; |
1121 | 1121 |
|
1122 |
-#if 0 |
|
1123 |
- printf("varc=%4d avg_var=%4d (sum=%4d) vard=%4d mx=%2d my=%2d\n", |
|
1124 |
- varc, s->avg_mb_var, sum, vard, mx - xx, my - yy); |
|
1125 |
-#endif |
|
1122 |
+ av_dlog(s, "varc=%4d avg_var=%4d (sum=%4d) vard=%4d mx=%2d my=%2d\n", |
|
1123 |
+ varc, s->avg_mb_var, sum, vard, mx - xx, my - yy); |
|
1126 | 1124 |
if(mb_type){ |
1127 | 1125 |
int p_score= FFMIN(vard, varc-500+(s->lambda2>>FF_LAMBDA_SHIFT)*100); |
1128 | 1126 |
int i_score= varc-500+(s->lambda2>>FF_LAMBDA_SHIFT)*20; |
... | ... |
@@ -273,12 +273,11 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s |
273 | 273 |
pc->overread++; |
274 | 274 |
} |
275 | 275 |
|
276 |
-#if 0 |
|
277 | 276 |
if(pc->overread){ |
278 |
- printf("overread %d, state:%X next:%d index:%d o_index:%d\n", pc->overread, pc->state, next, pc->index, pc->overread_index); |
|
279 |
- printf("%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]); |
|
277 |
+ av_dlog(pc, "overread %d, state:%X next:%d index:%d o_index:%d\n", |
|
278 |
+ pc->overread, pc->state, next, pc->index, pc->overread_index); |
|
279 |
+ av_dlog(pc, "%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]); |
|
280 | 280 |
} |
281 |
-#endif |
|
282 | 281 |
|
283 | 282 |
return 0; |
284 | 283 |
} |