--- encoder.c 2011/04/07 19:07:36 1.135.2.6 +++ encoder.c 2010/12/29 22:39:35 1.137 @@ -21,7 +21,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: encoder.c,v 1.135.2.6 2011/04/07 19:07:36 Isibaar Exp $ + * $Id: encoder.c,v 1.137 2010/12/29 22:39:35 Isibaar Exp $ * ****************************************************************************/ @@ -449,11 +449,7 @@ /* multithreaded stuff */ if (create->num_threads > 0) { -#ifndef HAVE_PTHREAD - int t = MAX(1, create->num_threads); -#else int t = MIN(create->num_threads, (int) (pEnc->mbParam.mb_height>>1)); /* at least two rows per thread */ -#endif int threads_per_slice = MAX(1, (t / pEnc->num_slices)); int rows_per_thread = (pEnc->mbParam.mb_height + threads_per_slice - 1) / threads_per_slice; @@ -1613,8 +1609,7 @@ memcpy((void *)((ptr_t)bs->start + pos), (void *)((ptr_t)pEnc->smpData[k].bs->start), len); - current->length += len; - pos += len; + current->length = pos += len; /* collect stats */ current->sStat.iTextBits += pEnc->smpData[k].sStat->iTextBits; @@ -1651,9 +1646,7 @@ int num_threads = MAX(1, MIN(pEnc->num_threads, num_slices)); int slices_per_thread = (num_slices*1024 / num_threads); int mb_height = pEnc->mbParam.mb_height; -#ifdef HAVE_PTHREAD void * status = NULL; -#endif uint16_t k; pEnc->mbParam.m_rounding_type = 1; @@ -1693,23 +1686,19 @@ } pEnc->smpData[0].bs = bs; pEnc->smpData[0].sStat = &pEnc->current->sStat; - -#ifdef HAVE_PTHREAD + /* create threads */ for (k = 1; k < num_threads; k++) { pthread_create(&pEnc->smpData[k].handle, NULL, (void*)SliceCodeI, (void*)&pEnc->smpData[k]); } -#endif SliceCodeI(&pEnc->smpData[0]); -#ifdef HAVE_PTHREAD /* wait until all threads are finished */ for (k = 1; k < num_threads; k++) { pthread_join(pEnc->smpData[k].handle, &status); } -#endif pEnc->current->length = BitstreamLength(bs) - (bits/8); @@ -1918,18 +1907,16 @@ int k = 0, bound = 0, num_slices = pEnc->num_slices; int num_threads = MAX(1, MIN(pEnc->num_threads, num_slices)); -#ifdef HAVE_PTHREAD void * status = NULL; + int slices_per_thread = (num_slices*1024 / num_threads); int threads_per_slice = (pEnc->num_threads*1024 / num_threads); -#endif - int slices_per_thread = (num_slices*1024 / num_threads); IMAGE *pRef = &reference->image; if (!reference->is_edged) { start_timer(); image_setedges(pRef, pParam->edged_width, pParam->edged_height, - pParam->width, pParam->height, XVID_BS_VERSION); + pParam->width, pParam->height, 0); stop_edges_timer(); reference->is_edged = 1; } @@ -2017,7 +2004,6 @@ } } -#ifdef HAVE_PTHREAD if (pEnc->num_threads > 0) { /* multithreaded motion estimation - dispatch threads */ @@ -2072,9 +2058,7 @@ current->fcode = pEnc->smpData[k].minfcode; } - } else -#endif - { + } else { /* regular ME */ @@ -2118,22 +2102,18 @@ pEnc->smpData[0].bs = bs; pEnc->smpData[0].sStat = ¤t->sStat; -#ifdef HAVE_PTHREAD /* create threads */ for (k = 1; k < num_threads; k++) { pthread_create(&pEnc->smpData[k].handle, NULL, (void*)SliceCodeP, (void*)&pEnc->smpData[k]); } -#endif SliceCodeP(&pEnc->smpData[0]); -#ifdef HAVE_PTHREAD /* wait until all threads are finished */ for (k = 1; k < num_threads; k++) { pthread_join(pEnc->smpData[k].handle, &status); } -#endif current->length = BitstreamLength(bs) - (bits/8); @@ -2149,8 +2129,7 @@ if (current->sStat.kblks + current->sStat.mblks < (pParam->frame_drop_ratio * mb_width * mb_height) / 100 && - ( (pEnc->bframenum_head >= pEnc->bframenum_tail) || !(pEnc->mbParam.global_flags & XVID_GLOBAL_CLOSED_GOP)) && - (current->coding_type == P_VOP) ) + ( (pEnc->bframenum_head >= pEnc->bframenum_tail) || !(pEnc->mbParam.global_flags & XVID_GLOBAL_CLOSED_GOP)) ) { current->sStat.kblks = current->sStat.mblks = current->sStat.iTextBits = 0; current->sStat.ublks = mb_width * mb_height; @@ -2296,11 +2275,9 @@ int bits = BitstreamPos(bs); int k = 0, bound = 0, num_slices = pEnc->num_slices; int num_threads = MAX(1, MIN(pEnc->num_threads, num_slices)); -#ifdef HAVE_PTHREAD void * status = NULL; + int slices_per_thread = (num_slices*1024 / num_threads); int threads_per_slice = (pEnc->num_threads*1024 / num_threads); -#endif - int slices_per_thread = (num_slices*1024 / num_threads); IMAGE *f_ref = &pEnc->reference->image; IMAGE *b_ref = &pEnc->current->image; @@ -2324,8 +2301,8 @@ if (!pEnc->reference->is_edged) { image_setedges(f_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, - pEnc->mbParam.height, XVID_BS_VERSION); - pEnc->reference->is_edged = 1; + pEnc->mbParam.height, 0); + pEnc->reference->is_edged = 1; } if (pEnc->reference->is_interpolated != 0) { @@ -2341,7 +2318,7 @@ if (!pEnc->current->is_edged) { image_setedges(b_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, - pEnc->mbParam.height, XVID_BS_VERSION); + pEnc->mbParam.height, 0); pEnc->current->is_edged = 1; } @@ -2367,7 +2344,6 @@ start_timer(); -#ifdef HAVE_PTHREAD if (pEnc->num_threads > 0) { /* multithreaded motion estimation - dispatch threads */ @@ -2423,9 +2399,7 @@ if (pEnc->smpData[k].minbcode > frame->bcode) frame->bcode = pEnc->smpData[k].minbcode; } - } else -#endif - { + } else { MotionEstimationBVOP(&pEnc->mbParam, frame, ((int32_t)(pEnc->current->stamp - frame->stamp)), /* time_bp */ @@ -2475,22 +2449,18 @@ } } -#ifdef HAVE_PTHREAD for (k = 1; k < num_threads; k++) { pthread_create(&pEnc->smpData[k].handle, NULL, (void*)SliceCodeB, (void*)&pEnc->smpData[k]); } -#endif pEnc->smpData[0].bs = bs; pEnc->smpData[0].sStat = &frame->sStat; SliceCodeB(&pEnc->smpData[0]); -#ifdef HAVE_PTHREAD for (k = 1; k < num_threads; k++) { pthread_join(pEnc->smpData[k].handle, &status); } -#endif frame->length = BitstreamLength(bs) - (bits/8);