diff --git a/README.md b/README.md index f002e50..852856f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ -plaYUVer +PlaYUVer - Enhanced raw video player ======== + plaYUVer is an open-source video player with the following features: - Support for libavformat and libavcodec; - Support for wide range of raw video formats; @@ -8,21 +9,24 @@ plaYUVer is an open-source video player with the following features: - Advanced frame zoom with easy to use pan function - Usefull information in status bar, *e.g.*, pixel information - Usefull sidebars with stream and frame information, *e.g.*, frame histogram +- Constant growing libs for stream and frame processing (PlaYUVerStream PlaYUVerFrame) - Advanced API for frame/video processing algorithms - -Builds ----------------------------------------------------------------- -Download update build for windows and linux from our SourceForge project page +- Frame level quality measurement API based on the PlaYUVerFrame class Developers ---------------------------------------------------------------- - Joao Carreira (jfmcarreira@gmail.com) -- Lui�s Lucas (luisfrlucas@gmail.com) +- Lui­s Lucas (luisfrlucas@gmail.com) -Install using cmake +Builds +---------------------------------------------------------------- +Download update build for windows and linux from our SourceForge project page + + +Build/Install using cmake ---------------------------------------------------------------- 1. The following are required for compilation: diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 722a762..1520d1d 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -70,7 +70,7 @@ IF( WIN32 ) SET(CPACK_GENERATOR "ZIP") SET(OS "Windows") - + SET(GIT_BRANCH "devel") # temp work around #EXECUTE_PROCESS(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${DAY}) #string(REGEX REPLACE "(..)/(..)/..(..).*" "\\1/\\2/\\3" ${DAY} ${${DAY}}) @@ -93,8 +93,9 @@ IF( PLAYUVER_LONGVERSIONNAME ) SET( PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME} ) ELSE() # message(STATUS ${GIT_BRANCH} ) - STRING(REPLACE "master" "stable" __version_name_deb ${GIT_BRANCH} ) - STRING(REPLACE "devel" "latest" __version_name_deb ${GIT_BRANCH} ) + SET( __version_name_deb ${GIT_BRANCH} ) + STRING(REPLACE "master" "stable" __version_name_deb ${__version_name_deb} ) + STRING(REPLACE "devel" "latest" __version_name_deb ${__version_name_deb} ) message(STATUS ${GIT_BRANCH} ) SET( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${__version_name_deb}${APPEND_VERSION}-${OS}-${CPACK_PACKAGE_ARCHITECTURE}" ) SET( PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME} ) diff --git a/source/app/plaYUVerApp.cpp b/source/app/plaYUVerApp.cpp index 658c313..a59762f 100644 --- a/source/app/plaYUVerApp.cpp +++ b/source/app/plaYUVerApp.cpp @@ -886,7 +886,7 @@ Void plaYUVerApp::updatePixelValueStatusBar( const QPoint & pos, PlaYUVerFrame* Void plaYUVerApp::dragEnterEvent( QDragEnterEvent *event ) { //setText(tr("")); - setBackgroundRole( QPalette::Highlight ); + mdiArea->setBackgroundRole( QPalette::Highlight ); event->acceptProposedAction(); } @@ -1277,7 +1277,7 @@ Void plaYUVerApp::createMenus() m_arrayMenu[DOCK_VIEW_MENU] = createPopupMenu(); if( m_arrayMenu[DOCK_VIEW_MENU] ) { - actionPopupMenu = m_arrayMenu[VIEW_MENU]->addMenu( m_arrayMenu[DOCK_VIEW_MENU] ); + QAction *actionPopupMenu = m_arrayMenu[VIEW_MENU]->addMenu( m_arrayMenu[DOCK_VIEW_MENU] ); actionPopupMenu->setText( tr( "&Toolbars/Docks" ) ); } diff --git a/source/app/plaYUVerApp.h b/source/app/plaYUVerApp.h index fd701a9..733816d 100644 --- a/source/app/plaYUVerApp.h +++ b/source/app/plaYUVerApp.h @@ -62,7 +62,9 @@ protected: private Q_SLOTS: - //! File functions + /** + * File functions slots + */ void open(); void save(); void format(); @@ -72,7 +74,9 @@ private Q_SLOTS: void closeActiveWindow(); void closeAll(); - //! Playing functions + /** + * Playing functions slots + */ void play(); void pause(); void stop(); @@ -95,13 +99,10 @@ private Q_SLOTS: void normalSize(); void zoomToFit(); - //! Show a message box with some information about the plaYUVerApp App void about(); void chageSubWindowSelection(); - void updateWindowMenu(); - - //! Drag and drop functions + void updateWindowMenu();s void dragEnterEvent( QDragEnterEvent *event ); void dropEvent( QDropEvent *event ); @@ -135,7 +136,7 @@ private: QPainter painter( viewport() ); QSize logoSize = 2 * size() / 3; - QPixmap pixFinalLogo = m_pixmapLogo.scaled(logoSize,Qt::KeepAspectRatio); + QPixmap pixFinalLogo = m_pixmapLogo.scaled( logoSize, Qt::KeepAspectRatio ); // Calculate the logo position - the bottom right corner of the mdi area. int x = width() / 2 - pixFinalLogo.width() / 2; @@ -143,11 +144,9 @@ private: painter.drawPixmap( x, y, pixFinalLogo ); } private: - // Store the logo image. QPixmap m_pixmapLogo; }; - //QMdiArea *mdiArea; PlaYUVerMdiArea *mdiArea; SubWindowHandle *m_pcCurrentSubWindow; ModulesHandle *m_pcModulesHandle; @@ -165,7 +164,9 @@ private: Void zoomToFitAll(); - //! Playing functions + /** + * Playing functions + */ UInt64 getMaxFrameNumber(); Void startPlay(); Void setTimerStatus(); @@ -196,6 +197,8 @@ private: QLabel *m_pcTotalFrameNumLabel; QDoubleSpinBox *m_pcZoomFactorSBox; + + QSignalMapper *mapperZoom; QSignalMapper *mapperSeekVideo; QSignalMapper *mapperWindow; @@ -220,6 +223,9 @@ private: }; QVector m_arrayMenu; + /** + * Array of side bars for the main app + */ enum SIDEBAR_LIST { STREAM_DOCK = 0, @@ -233,6 +239,9 @@ private: FramePropertiesSideBar* m_pcFrameProperties; QualityMeasurementSidebar* m_pcQualityMeasurement; + /** + * Array of tool bars for the main app + */ enum TOOLBAR_LIST { FILE_TOOLBAR = 0, @@ -242,6 +251,9 @@ private: }; QVector m_arrayToolBars; + /** + * Array of actions for the main app + */ enum APP_ACTION_LIST { OPEN_ACT = 0, @@ -278,7 +290,7 @@ private: TOTAL_ACT, }; QVector m_arrayActions; - QAction *actionPopupMenu; + //QAction *actionPopupMenu; // Tools Actions; QActionGroup *actionGroupTools;