You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
1.2 KiB
53 lines
1.2 KiB
Index: src/encoder.c |
|
--- src/encoder.c.orig 2007-02-08 14:10:24 +0100 |
|
+++ src/encoder.c 2009-02-28 22:47:19 +0100 |
|
@@ -1712,6 +1712,7 @@ |
|
} |
|
|
|
|
|
+#if 0 |
|
if (pEnc->num_threads > 0) { |
|
/* multithreaded motion estimation - dispatch threads */ |
|
|
|
@@ -1753,12 +1754,15 @@ |
|
} |
|
|
|
} else { |
|
+#endif |
|
/* regular ME */ |
|
|
|
MotionEstimation(&pEnc->mbParam, current, reference, |
|
&pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, |
|
&pEnc->vGMC, 256*4096); |
|
+#if 0 |
|
} |
|
+#endif |
|
|
|
stop_motion_timer(); |
|
|
|
@@ -2008,6 +2012,7 @@ |
|
frame->fcode = frame->bcode = pEnc->current->fcode; |
|
|
|
start_timer(); |
|
+#if 0 |
|
if (pEnc->num_threads > 0) { |
|
void * status; |
|
int k; |
|
@@ -2054,6 +2059,7 @@ |
|
frame->bcode = pEnc->motionData[k].minbcode; |
|
} |
|
} else { |
|
+#endif |
|
MotionEstimationBVOP(&pEnc->mbParam, frame, |
|
((int32_t)(pEnc->current->stamp - frame->stamp)), /* time_bp */ |
|
((int32_t)(pEnc->current->stamp - pEnc->reference->stamp)), /* time_pp */ |
|
@@ -2061,7 +2067,9 @@ |
|
&pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv, |
|
pEnc->current, b_ref, &pEnc->vInterH, |
|
&pEnc->vInterV, &pEnc->vInterHV); |
|
+#if 0 |
|
} |
|
+#endif |
|
stop_motion_timer(); |
|
|
|
set_timecodes(frame, pEnc->reference,pEnc->mbParam.fbase);
|
|
|