Skip to content

Parallelize HM-15.0-dev #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sammymax wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Parallelize HM-15.0-dev #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d39e6b
create HM-15.0 based development branch
Jul 8, 2014
551413d
Change .gitignore to use tapir; fix compiler errors
sammymax Oct 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# initial / is needed or else x/bin/... will also be ignored
/bin
/lib
/build/linux/app/*/objects
/build/linux/lib/*/objects
/build/linux/utils/*/objects
21 changes: 11 additions & 10 deletions build/linux/common/makefile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ endif
#########################################################
# executables used
#########################################################
TAPIR_DIR = ~/tapir/src/build/bin

CPP = g++
CC = gcc
CPP = $(TAPIR_DIR)/clang++
CC = $(TAPIR_DIR)/clang
AR = ar
LD = $(CPP)
ASM = nasm
Expand All @@ -29,7 +30,7 @@ STAT_RELEASE_OUT = $(LIB_DIR)/lib$(PRJ_NAME)Static.a
DYN_DEBUG_OUT = $(LIB_DIR)/lib$(PRJ_NAME)d.so
DYN_RELEASE_OUT = $(LIB_DIR)/lib$(PRJ_NAME).so
#
else
else
ifeq ($(CONFIG), CONSOLE)
# the executables that can be created
STAT_DEBUG_OUT = $(BIN_DIR)/$(PRJ_NAME)Staticd
Expand All @@ -49,7 +50,7 @@ endif
#CPPFLAGS = -Wall -fPIC $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS)
CPPFLAGS = -fPIC $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) -Wall -Wshadow -Wno-sign-compare -Werror

##########
##########
# enforce 32-bit build : 1=yes, 0=no
##########
M32?= 0
Expand Down Expand Up @@ -88,7 +89,7 @@ RELEASE_ASMFLAGS =
# linker flags for all
ALL_LDFLAGS = -Wall

##########
##########
# enforce 32-bit build : 1=yes, 0=no
##########
ifeq ($(M32),1)
Expand Down Expand Up @@ -128,7 +129,7 @@ endif
# objects that have to be created
#########################################################

# the object types that have to be created
# the object types that have to be created
RELEASE_OBJS = $(OBJS:.o=.r.o)
DEBUG_OBJS = $(OBJS:.o=.d.o)

Expand Down Expand Up @@ -351,15 +352,15 @@ release: check_errors \
#stat_debug: check_errors \
# $(CHECK_DIRS) \
# $(STAT_DEBUG_OUT)
#
#
#dyn_debug: check_errors \
# $(CHECK_DIRS) \
# $(DYN_DEBUG_OUT)
#
#stat_release: check_errors \
# $(CHECK_DIRS) \
# $(STAT_RELEASE_OUT)
#
#
#dyn_release: check_errors \
# $(CHECK_DIRS) \
# $(DYN_RELEASE_OUT)
Expand Down Expand Up @@ -412,11 +413,11 @@ $(STAT_RELEASE_OUT): $(RELEASE_OBJS)
#
#
# create dynamic debug out
$(DYN_DEBUG_OUT): $(DYN_DEBUG_OUT).$(VER)
$(DYN_DEBUG_OUT): $(DYN_DEBUG_OUT).$(VER)
ln -fs lib$(PRJ_NAME)d.so.$(VER) $@
#
# create dynamic debug out
$(DYN_DEBUG_OUT).$(VER): $(DEBUG_OBJS)
$(DYN_DEBUG_OUT).$(VER): $(DEBUG_OBJS)
$(LD) $(LDFLAGS) $(DEBUG_LDFLAGS) -o $@ $(DEBUG_OBJS) -L$(LIB_DIR) $(USER_LIB_DIRS) $(LIBS) $(DEBUG_LIBS) $(DYN_LIBS) $(DYN_DEBUG_LIBS)
#
#
Expand Down
7 changes: 2 additions & 5 deletions source/Lib/TLibCommon/TComLoopFilter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,8 @@ Void TComLoopFilter::destroy()
{
for( UInt uiDir = 0; uiDir < 2; uiDir++ )
{
if (m_aapucBS)
{
delete [] m_aapucBS [uiDir];
m_aapucBS [uiDir] = NULL;
}
delete [] m_aapucBS [uiDir];
m_aapucBS [uiDir] = NULL;
if (m_aapbEdgeFilter[uiDir])
{
delete [] m_aapbEdgeFilter[uiDir];
Expand Down
3 changes: 0 additions & 3 deletions source/Lib/TLibCommon/TComPic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,6 @@ class TComPic
UInt getMinCUWidth() { return m_apcPicSym->getMinCUWidth(); }
UInt getMinCUHeight() { return m_apcPicSym->getMinCUHeight(); }

UInt getParPelX(UChar uhPartIdx) { return getParPelX(uhPartIdx); }
UInt getParPelY(UChar uhPartIdx) { return getParPelX(uhPartIdx); }

Int getStride() { return m_apcPicYuv[1]->getStride(); }
Int getCStride() { return m_apcPicYuv[1]->getCStride(); }

Expand Down