Index: main.cpp =================================================================== --- main.cpp (revision 26519) +++ main.cpp (working copy) @@ -649,8 +649,10 @@ { void (*update_func)(float) = NULL; int (*check_func)() = NULL; +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1, deleteMap size: %2").arg(__LINE__).arg(deleteMap.size())); if (useCutlist && !found_infile) pginfo->QueryCutList(deleteMap); +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1, deleteMap size: %2").arg(__LINE__).arg(deleteMap.size())); if (jobID >= 0) { glbl_jobID = jobID; @@ -676,17 +678,23 @@ } else { +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1, deleteMap size: %2").arg(__LINE__).arg(deleteMap.size())); result = m2f->Start(); +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1, deleteMap size: %2").arg(__LINE__).arg(deleteMap.size())); if (result == REENCODE_OK) { +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1, deleteMap size: %2").arg(__LINE__).arg(deleteMap.size())); result = BuildKeyframeIndex(m2f, outfile, posMap, jobID); +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1, deleteMap size: %2").arg(__LINE__).arg(deleteMap.size())); if (result == REENCODE_OK) { +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1, deleteMap size: %2").arg(__LINE__).arg(deleteMap.size())); if (update_index) UpdatePositionMap(posMap, NULL, pginfo); else UpdatePositionMap(posMap, outfile + QString(".map"), pginfo); +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1, deleteMap size: %2").arg(__LINE__).arg(deleteMap.size())); } } } @@ -761,28 +769,42 @@ static uint64_t ComputeNewBookmark(uint64_t oldBookmark, frm_dir_map_t *deleteMap) { +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1").arg(__LINE__)); if (deleteMap == NULL) return oldBookmark; +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1").arg(__LINE__)); uint64_t subtraction = 0; uint64_t startOfCutRegion = 0; frm_dir_map_t delMap = *deleteMap; bool withinCut = false; +VERBOSE(VB_IMPORTANT, QString("main.cpp oldBookmark %1").arg(oldBookmark)); +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1").arg(__LINE__)); while (delMap.count() && delMap.begin().key() <= oldBookmark) { +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1").arg(__LINE__)); if (delMap.begin().data() == MARK_CUT_START && !withinCut) { +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1").arg(__LINE__)); withinCut = true; startOfCutRegion = delMap.begin().key(); +VERBOSE(VB_IMPORTANT, QString("main.cpp startOfCutRegion %1").arg(startOfCutRegion)); } else if (delMap.begin().data() == MARK_CUT_END && withinCut) { +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1").arg(__LINE__)); withinCut = false; subtraction += (delMap.begin().key() - startOfCutRegion); +VERBOSE(VB_IMPORTANT, QString("main.cpp subtraction %1").arg(subtraction)); } +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1").arg(__LINE__)); delMap.remove(delMap.begin()); } +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1").arg(__LINE__)); if (withinCut) subtraction += (oldBookmark - startOfCutRegion); +VERBOSE(VB_IMPORTANT, QString("main.cpp subtraction %1").arg(subtraction)); +VERBOSE(VB_IMPORTANT, QString("main.cpp LINE: %1").arg(__LINE__)); +VERBOSE(VB_IMPORTANT, QString("main.cpp returning(oldBookmark(%1) - subtraction(%2) = %3").arg(oldBookmark).arg(subtraction).arg(oldBookmark - subtraction)); return oldBookmark - subtraction; }