GithubStar/QtAV
1
0
Fork 0
mirror of https://github.com/wang-bin/QtAV.git synced 2026-10-28 02:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

no include ipp by default

Browse Source
This commit is contained in:
wang-bin
2014-03-08 18:07:42 +08:00
parent 5e3a9a6f28
commit c19eb3fc4c
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ImageConverter.cpp
+3 -1
View File
@@ -1,6 +1,6 @@
/******************************************************************************
ImageConverter: Base class for image resizing & color model convertion
Copyright (C) 2012-2013 Wang Bin <wbsecg1@gmail.com>
Copyright (C) 2012-2014 Wang Bin <wbsecg1@gmail.com>
* This file is part of QtAV
@@ -35,7 +35,9 @@ extern void RegisterImageConverterIPP_Man();
void ImageConverter_RegisterAll()
{
RegisterImageConverterFF_Man();
#if QTAV_HAVE(IPP)
RegisterImageConverterIPP_Man();
#endif //QTAV_HAVE(IPP)
}
src/ImageConverterIPP.cpp
+3 -3
View File
@@ -1,6 +1,6 @@
/******************************************************************************
ImageConverterIPP: Image resizing & color model convertion using Intel IPP
Copyright (C) 2012-2013 Wang Bin <wbsecg1@gmail.com>
Copyright (C) 2012-2014 Wang Bin <wbsecg1@gmail.com>
* This file is part of QtAV
@@ -24,7 +24,7 @@
#include <QtAV/QtAV_Compat.h>
#include "prepost.h"
#ifdef IPP_LINK
#if QTAV_HAVE(IPP)
#include <ipp.h>
#else
@@ -68,7 +68,7 @@ bool ImageConverterIPP::convert(const quint8 *const srcSlice[], const int srcStr
{
DPTR_D(ImageConverterIPP);
//color convertion, no scale
#ifdef IPP_LINK
#if QTAV_HAVE(IPP)
struct {
const quint8 *data[3];
int linesize[3];
src/libQtAV.pro
+3 -3
View File
@@ -52,10 +52,11 @@ config_avresample {
SOURCES += AudioResamplerLibav.cpp
LIBS += -lavresample
}
ipp-link {
DEFINES += IPP_LINK
config_ipp {
DEFINES += QTAV_HAVE_IPP=1
ICCROOT = $$(IPPROOT)/../compiler
INCLUDEPATH += $$(IPPROOT)/include
SOURCES += ImageConverterIPP.cpp
message("QMAKE_TARGET.arch" $$QMAKE_TARGET.arch)
*64|contains(QMAKE_TARGET.arch, x86_64)|contains(TARGET_ARCH, x86_64) {
IPPARCH=intel64
@@ -162,7 +163,6 @@ SOURCES += \
GraphicsItemRenderer.cpp \
ImageConverter.cpp \
ImageConverterFF.cpp \
ImageConverterIPP.cpp \
QPainterRenderer.cpp \
OSD.cpp \
OSDFilter.cpp \