Merge branch 'master' into jfmcarreira-dev

This commit is contained in:
jfmcarreira committed 2014-03-29 01:52:34 +00:00
commit 9d4af957f9
32 files changed
+125 -83

No files matched your search

+8 -5
View File
@@ -1,15 +1,18 @@
plaYUVer
========
plaYUVer is an open-source 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;
- zoom and pixel information
- API for frame processing algorithms
Usage
Developers
----------------------------------------------------------------
Command line interface
./playuver
- João Carreira (jfmcarreira@gmail.com)
- Luís Lucas (luisfrlucas@gmail.com)
Install using cmake
+24 -1
View File
@@ -1,4 +1,27 @@
/* Input config.h file */
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
* \file config.h.in
* \brief definition of the building options
*/
#ifndef __CONFIG_PLAYUVER_H__
#define __CONFIG_PLAYUVER_H__
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+5 -4
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,8 +22,8 @@
* \brief Dialog box to set the sequence resolution
*/
#ifndef __CONFIGURERESOLUTIONDIALOG_H__
#define __CONFIGURERESOLUTIONDIALOG_H__
#ifndef __CONFIGUREFORMATDIALOG_H__
#define __CONFIGUREFORMATDIALOG_H__
#include "config.h"
@@ -127,4 +128,4 @@ private:
} // NAMESPACE
#endif // __CONFIGURERESOLUTIONDIALOG_H__
#endif // __CONFIGUREFORMATDIALOG_H__
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+3 -2
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,7 +19,7 @@
/**
* \file InputStream.cpp
* \brief Input handling
* \brief Input stream handling
*/
#include "config.h"
+3 -2
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,7 +19,7 @@
/**
* \file InputStream.h
* \brief Input handling
* \brief Input stream handling
*/
#ifndef __INPUTSTREAM_H__
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+2 -2
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -15,7 +16,6 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
* \file ModulesHandle.h
* \brief PlaYUVer modules handle
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+3 -2
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVerApp project
* Copyright (C) 2014 by plaYUVerApp developers
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+6 -5
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVerApp project
* Copyright (C) 2014 by plaYUVerApp developers
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,8 +22,8 @@
* \brief Main side bar definition
*/
#ifndef PROPERTIESSIDEBAR_H
#define PROPERTIESSIDEBAR_H
#ifndef __PROPERTIESSIDEBAR_H__
#define __PROPERTIESSIDEBAR_H__
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
@@ -79,4 +80,4 @@ private:
} // NAMESPACE
#endif
#endif // __PROPERTIESSIDEBAR_H__
+3 -2
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,7 +18,7 @@
*/
/**
* \file imageinterface.cpp
* \file SubWindowHandle.cpp
* \brief Sub windows handling
*/
+21 -20
View File
@@ -1,28 +1,29 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
* \file imageinterface.h
* \file SubWindowHandle.h
* \brief Sub windows handling
*/
#ifndef __IMAGEINTERFACE_H__
#define __IMAGEINTERFACE_H__
#ifndef __SUBWINDOWHANDLE_H__
#define __SUBWINDOWHANDLE_H__
#include "config.h"
@@ -147,4 +148,4 @@ public Q_SLOTS:
} // NAMESPACE
#endif // __IMAGEINTERFACE_H__
#endif // __SUBWINDOWHANDLE_H__
+2 -14
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -111,19 +112,6 @@ typedef UChar Pel; ///< 8-bit pixel type
// PlaYUVer definitions
// ====================================================================================================================
enum InputStreamFormats
{
NO_FMT = -1,
YUV420p,
YUV444p,
YUV422p,
YUV411p,
YUV410p,
GRAY,
RGB8,
NUMBER_FORMATS
};
enum ColorSpace
{
COLOR_INVALID = -1,
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+3 -2
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,7 +18,7 @@
*/
/**
* \file main.cp
* \file main.cpp
* \brief main file
*/
+3 -2
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVerApp project
* Copyright (C) 2014 by plaYUVerApp developers
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+3 -2
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVerApp project
* Copyright (C) 2014 by plaYUVerApp developers
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by