bug fix

houxiao

2017-04-13 0727355ae017c0153ee7c643cdd1b0611c81627f

 VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp

@@ -62,6 +62,17 @@
                           frameRGB, 3 * src_width,

                           src_width, src_height);

        frameRGBSize = src_height * src_width * 3;



        //{

        //    static size_t f = 0;

        //    char fname[50];

        //    sprintf(fname, "/sdcard/face-%u.rgb", ++f);

        //    FILE *pFile = fopen(fname, "wb");

        //    fwrite(frameRGB, 1, frameRGBSize, pFile);

        //    fclose(pFile);

        //    if (f > 20)exit(0);

        //}



        return true;

   }

};

@@ -151,17 +162,28 @@
    {

        const FaceRect& faceRect(ctx.faceFeatures[i].rect);

        cv::Mat roiMat(yMat, cv::Rect(faceRect.leftTop.x, faceRect.leftTop.y, faceRect.rightBottom.x - faceRect.leftTop.x, faceRect.rightBottom.y - faceRect.leftTop.y));

        
        size_t s = roiMat.total() * roiMat.elemSize();



      PbFaceList_FaceListImage pbFaceListImage;

      pbFaceListImage.set_idx(i);

      pbFaceListImage.set_size(roiMat.elemSize());

      pbFaceListImage.set_size(s);

      pbFaceListImage.set_type(PbFaceList_FaceListImage_ImageType_IT_Y);

      pbFaceListImage.set_width(roiMat.cols);

      pbFaceListImage.set_height(roiMat.rows);

      pbFaceListImage.set_top_left_x(faceRect.leftTop.x);

      pbFaceListImage.set_top_left_y(faceRect.leftTop.y);

      

      pbFaceListImage.add_img(roiMat.ptr(), roiMat.total() * roiMat.elemSize());

      pbFaceListImage.add_img(roiMat.ptr(), s);



        //{

        //    static size_t f = 0;

        //    char fname[50];

        //    sprintf(fname, "/sdcard/face-%u.yuv", ++f);

        //    FILE *pFile = fopen(fname, "wb");

        //    fwrite(roiMat.ptr(), 1, s, pFile);

        //    fclose(pFile);

        //    if (f > 20)exit(0);

        //}

    }



   size_t s = pbFaceList.ByteSize();

@@ -171,9 +193,11 @@
    return buffMaxSize > 0;

}



bool FaceCache::getFaceListImage(int* buffIdx, size_t& count, uint8_t* buffImg, size_t& buffImgMaxSize)

bool FaceCache::getFaceListImage(std::vector<NativeImgIdx>& imgIdxes, uint8_t* buffImg, size_t& buffImgMaxSize)

{

    FcPmBreackerContext& ctx(*(FcPmBreackerContext*)_ctx);

    if (!ctx.dataAvailable)

        return false;



    if (ctx.frameRGBSize == 0)

    {

@@ -181,31 +205,64 @@
        if (! ctx.convertYUV420ToRGB())

            return false;

    }

	
   count = 0;

   uint8_t* pBuff = buffImg;

   size_t totalSize = 0;



    imgIdxes.clear();

   size_t offset = 0;



    cv::Mat rgbMat(cv::Size(ctx.width, ctx.height), CV_8UC3, ctx.frameRGB);

    for (st_ff_vect_t::const_iterator ffiter = ctx.faceFeatures.begin(); ffiter != ctx.faceFeatures.end(); ++ffiter)

    {

        const FaceRect& faceRect(ffiter->rect);

        cv::Mat roiMat(rgbMat, cv::Rect(faceRect.leftTop.x, faceRect.leftTop.y, faceRect.rightBottom.x - faceRect.leftTop.x, faceRect.rightBottom.y - faceRect.leftTop.y));

		
        cv::Mat roiMat1(rgbMat, cv::Rect(faceRect.leftTop.x, faceRect.leftTop.y, faceRect.rightBottom.x - faceRect.leftTop.x, faceRect.rightBottom.y - faceRect.leftTop.y));

        cv::Mat roiMat(roiMat1.clone()); // #todo copy data should be avoid!!!!



        NativeImgIdx imgidx;

        imgidx.offset = offset;

        imgidx.size = roiMat.total() * roiMat.elemSize();

        imgidx.type = MB_Frame::MBFT_RGB;

        imgidx.width = roiMat.cols;

        imgidx.height = roiMat.rows;



        const size_t newSize = imgidx.offset + imgidx.size;



      //isContinuous

      size_t s = roiMat.total() * roiMat.elemSize();

      if (totalSize + s <= buffImgMaxSize)

      {

         memcpy(pBuff, roiMat.ptr(), s);

         *buffIdx = int(totalSize);

			
         pBuff += s;

         totalSize += s;

         count++;

         buffIdx++;

      }

      if (newSize > buffImgMaxSize)

        {

            LOG_ERROR << "FaceCache::getFaceListImage buffImgMaxSize truncated" << LOG_ENDL;

            return false;

        }





        uint8_t* pbuf = buffImg + imgidx.offset;

        memcpy(pbuf, roiMat.ptr(), imgidx.size);



        //uint8_t* pbuf = buffImg + imgidx.offset;

        //cv::Mat roiMat1(roiMat.cols, roiMat.rows, CV_8UC3, pbuf);

        //pbuf[0]=123;

        //roiMat.copyTo(roiMat1);

        //memcpy(buffImg + imgidx.offset, roiMat.ptr(), imgidx.size);



        //uint8_t* pbuf = buffImg + imgidx.offset;

        //for(size_t r = 0; r < roiMat.rows; r++)

        //{

        //    const uint8_t* pcol = roiMat.ptr<uint8_t>(r);

        //    memcpy(pbuf, pcol, roiMat.cols);

        //    pbuf += roiMat.cols;

        //}



        //{

        //    static size_t f = 0;

        //    char fname[50];

        //    sprintf(fname, "/sdcard/face-%u.rgb", ++f);

        //    FILE *pFile = fopen(fname, "wb");

        //    fwrite(pbuf, 1, imgidx.size, pFile);

        //    fclose(pFile);

        //    if (f > 20)exit(0);

        //}



        imgIdxes.push_back(imgidx);

        offset = newSize;

    }



    buffImgMaxSize = totalSize;

    return (count != 0);

    return true;

}