Changeset 12 in 3DVCSoftware for branches/0.2-poznan-univ/source/App/TAppDecoder
- Timestamp:
- 6 Feb 2012, 00:52:17 (13 years ago)
- Location:
- branches/0.2-poznan-univ/source/App/TAppDecoder
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/0.2-poznan-univ/source/App/TAppDecoder/TAppDecTop.cpp
r11 r12 64 64 // m_iPOCLastDisplay = -1; 65 65 m_pScaleOffsetFile = 0; 66 67 #if POZNAN_MP 68 m_pcMP = NULL; 69 #endif 66 70 } 67 71 … … 71 75 72 76 m_apcBitstream->create( BITS_BUF_SIZE ); 77 78 #if POZNAN_MP 79 m_pcMP = new TComMP(); 80 #endif 73 81 } 74 82 … … 89 97 free(m_pchReconFile); 90 98 } 99 100 #if POZNAN_MP 101 if(m_pcMP) { delete m_pcMP; m_pcMP = NULL; }; 102 #endif 91 103 } 92 104 … … 163 175 if( eNalUnitType == NAL_UNIT_SPS ) 164 176 { 165 #if POZNAN_ SYNTH177 #if POZNAN_CU_SKIP||POZNAN_CU_SYNTH 166 178 if(cComSPS.getViewId()==0 && !cComSPS.isDepth()) // it should be called at first view at the begining of the stream 167 179 initRenderer(cComSPS); … … 416 428 if ( m_pchReconFile ) 417 429 { 430 431 #if POZNAN_NONLINEAR_DEPTH 432 TComSPS* pcSPS = pcPic->getSlice(0)->getSPS(); 433 TComPicYuv cPicPower; 434 435 //pcPic->getPicYuvRec() 436 cPicPower.create(pcSPS->getWidth(), pcSPS->getHeight(), pcSPS->getMaxCUWidth(), pcSPS->getMaxCUHeight(), pcSPS->getMaxCUDepth() ); 437 438 pcPic->getPicYuvRec()->power(&cPicPower, 1.0f/pcSPS->getDepthPower()); 439 440 m_acTVideoIOYuvDepthReconFileList[iViewIdx]->write(&cPicPower, pcSPS->getPad()); 441 cPicPower.destroy(); 442 #else 418 443 m_acTVideoIOYuvDepthReconFileList[iViewIdx]->write( pcPic->getPicYuvRec(), pcPic->getSlice(0)->getSPS()->getPad() ); 444 #endif 419 445 } 420 446 … … 544 570 } 545 571 546 #if POZNAN_ SYNTH572 #if POZNAN_CU_SYNTH || POZNAN_CU_SKIP 547 573 Void TAppDecTop::initRenderer(TComSPS &cComSPS) 548 574 { … … 566 592 iNearestViewIdx = 0; 567 593 bRenderFromLeft = iCoddedViewOrderIdx>0?true:false; 568 //m_cCamParsCollector.getNearestBaseView(iCoddedViewIdx, iNearestViewIdx, iRelDistToLeft, bRenderFromLeft);569 594 570 595 m_cAvailabilityRenderer.setShiftLUTs( … … 592 617 pcPicYuvAvailView = pcPic->getPicYuvAvail(); 593 618 } 619 #if POZNAN_TEXTURE_TU_DELTA_QP_ACCORDING_TO_DEPTH 620 TComPicYuv* pcPicYuvSynthDepthView = pcPic->getPicYuvSynthDepth(); 621 if(!pcPicYuvSynthDepthView) 622 { 623 pcPic->addSynthesisDepthBuffer(); 624 pcPicYuvSynthDepthView = pcPic->getPicYuvSynthDepth(); 625 } 626 m_cAvailabilityRenderer.extrapolateAvailabilityView( getPicFromView( iNearestViewIdx, iCurPoc, true )->getPicYuvRec(), getPicFromView( iNearestViewIdx, iCurPoc, true )->getPicYuvRec(), pcPicYuvSynthDepthView, pcPicYuvAvailView, bRenderFromLeft ); 627 628 #if POZNAN_OUTPUT_SYNTH 629 Char acFilenameBaseD[1024]; 630 ::sprintf( acFilenameBaseD, "SynthDepth_%s_V%d.yuv", ( true ? "Dec" : "Enc" ),iCoddedViewIdx ); 631 pcPicYuvSynthDepthView->dump(acFilenameBaseD, iCurPoc!=0); 632 #endif 633 #endif 594 634 595 635 //m_cAvailabilityRenderer.extrapolateAvailabilityView( xGetPicFromView( iNearestViewIdx, iCurPoc, false )->getPicYuvRec(), xGetPicFromView( iNearestViewIdx, iCurPoc, true )->getPicYuvRec(), pcPicYuvERView, pcPicYuvAvailView, bRenderFromLeft ); 596 636 m_cAvailabilityRenderer.extrapolateAvailabilityView( getPicFromView( iNearestViewIdx, iCurPoc, false )->getPicYuvRec(), getPicFromView( iNearestViewIdx, iCurPoc, true )->getPicYuvRec(), pcPicYuvSynthView, pcPicYuvAvailView, bRenderFromLeft ); 597 637 598 638 pcPicYuvAvailView->setBorderExtension( false );//Needed?? 599 639 pcPicYuvAvailView->extendPicBorder();//Needed?? … … 613 653 } 614 654 #endif 615 616 } 617 #endif 655 656 }//*/ 657 #endif -
branches/0.2-poznan-univ/source/App/TAppDecoder/TAppDecTop.h
r11 r12 52 52 #include "../../Lib/TLibCommon/TComDepthMapGenerator.h" 53 53 #include "../../Lib/TLibDecoder/TDecTop.h" 54 #if POZNAN_ SYNTH54 #if POZNAN_CU_SKIP || POZNAN_CU_SYNTH 55 55 #include "../../Lib/TLibRenderer/TRenTop.h" 56 56 #endif 57 57 #include "TAppDecCfg.h" 58 59 #if POZNAN_MP 60 #include "../../Lib/TLibCommon/TComMP.h" 61 #endif 58 62 59 63 // ==================================================================================================================== … … 90 94 #endif 91 95 92 #if POZNAN_ SYNTH96 #if POZNAN_CU_SKIP || POZNAN_CU_SYNTH 93 97 TRenTop m_cAvailabilityRenderer; 94 98 #endif 95 99 100 #if POZNAN_MP 101 TComMP* m_pcMP; 102 #endif 96 103 97 104 public: … … 105 112 Void startUsingDepth() ; 106 113 107 #if POZNAN_ SYNTH114 #if POZNAN_CU_SKIP || POZNAN_CU_SYNTH 108 115 Void initRenderer(TComSPS &cComSPS); 109 116 Void storeSynthPicsInBuffer(Int iCoddedViewIdx,Int iCoddedViewOrderIdx,Int iCurPoc,Bool bDepth); … … 120 127 #endif 121 128 129 #if POZNAN_MP 130 TComMP* getMP() { return m_pcMP; } 131 #endif 132 122 133 protected: 123 134 Void xCreateDecLib (); ///< create internal classes
Note: See TracChangeset for help on using the changeset viewer.