Skip to content

GitLab

Commit b6954ba2 authored by Loren Merritt's avatar Loren Merritt
Browse files
Options

rename 'core/' to 'common/', which avoids conflicts with libtool 


git-svn-id: svn://svn.videolan.org/x264/trunk@67 df754926-b1dd-0310-bc7b-ec298dee348c
parent da49faec
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 100 deletions
Jamfile
View file @ b6954ba2
......@@ -17,19 +17,19 @@ DEFINES = DEBUG __X264__ ARCH_$(OSPLAT) SYS_$(OS) ;
OPTIM = -O3 -funroll-loops ;
# Headers rep
HDRS = . core core/i386 decoder encoder ;
HDRS = . common common/i386 decoder encoder ;
SOURCES_C = core/mc.c core/predict.c core/pixel.c core/macroblock.c
core/frame.c core/dct.c core/cpu.c core/cabac.c
core/common.c core/mdate.c core/csp.c
SOURCES_C = common/mc.c common/predict.c common/pixel.c common/macroblock.c
common/frame.c common/dct.c common/cpu.c common/cabac.c
common/common.c common/mdate.c common/csp.c
encoder/analyse.c encoder/me.c encoder/ratecontrol.c
encoder/set.c encoder/macroblock.c encoder/cabac.c encoder/cavlc.c
encoder/encoder.c encoder/eval.c ;
SOURCES_X86 = core/i386/cpu.asm ;
SOURCES_MMX = core/i386/mc-c.c core/i386/dct-c.c core/i386/predict.c core/i386/dct.asm core/i386/pixel.asm core/i386/mc.asm ;
SOURCES_X86 = common/i386/cpu.asm ;
SOURCES_MMX = common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c common/i386/dct.asm common/i386/pixel.asm common/i386/mc.asm ;
SOURCES_ALTIVEC = core/ppc/mc.c core/ppc/pixel.c ;
SOURCES_ALTIVEC = common/ppc/mc.c common/ppc/pixel.c ;
# libx264
SOURCES_X264 = $(SOURCES_C) ;
......
Makefile
View file @ b6954ba2
......@@ -5,20 +5,20 @@
# Uncomment this for Mac OS X
#SYS_MACOSX=1
SRCS_COMMON= core/mc.c core/predict.c core/pixel.c core/macroblock.c \
core/frame.c core/dct.c core/cpu.c core/cabac.c \
core/common.c core/mdate.c core/csp.c \
SRCS_COMMON= common/mc.c common/predict.c common/pixel.c common/macroblock.c \
common/frame.c common/dct.c common/cpu.c common/cabac.c \
common/common.c common/mdate.c common/csp.c \
encoder/analyse.c encoder/me.c encoder/ratecontrol.c \
encoder/set.c encoder/macroblock.c encoder/cabac.c \
encoder/cavlc.c encoder/encoder.c encoder/eval.c x264.c
ifdef SYS_MACOSX
PFLAGS=-DARCH_PPC -DSYS_MACOSX -faltivec
SRCS= $(SRCS_COMMON) core/ppc/mc.c core/ppc/pixel.c
SRCS= $(SRCS_COMMON) common/ppc/mc.c common/ppc/pixel.c
else
PFLAGS=-DARCH_X86 -DHAVE_MMXEXT -DHAVE_SSE2 -DHAVE_MALLOC_H
SRCS= $(SRCS_COMMON) core/i386/mc-c.c core/i386/dct-c.c core/i386/predict.c
ASMSRC= core/i386/dct.asm core/i386/cpu.asm core/i386/pixel.asm core/i386/mc.asm
SRCS= $(SRCS_COMMON) common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
ASMSRC= common/i386/dct.asm common/i386/cpu.asm common/i386/pixel.asm common/i386/mc.asm
OBJASM= $(ASMSRC:%.asm=%.o)
endif
......
Makefile.cygwin
View file @ b6954ba2
......@@ -4,20 +4,20 @@ PFLAGS=-DARCH_X86 -DHAVE_MMXEXT -DHAVE_SSE2
CC=gcc
CFLAGS=-g -Wall -I. -mno-cygwin -DDEBUG -O4 -funroll-loops -D__X264__ -UHAVE_MALLOC_H $(PFLAGS)
SRCS= core/mc.c core/predict.c core/pixel.c core/macroblock.c \
core/frame.c core/dct.c core/cpu.c core/cabac.c \
core/common.c core/mdate.c core/csp.c \
SRCS= common/mc.c common/predict.c common/pixel.c common/macroblock.c \
common/frame.c common/dct.c common/cpu.c common/cabac.c \
common/common.c common/mdate.c common/csp.c \
encoder/analyse.c encoder/me.c encoder/ratecontrol.c \
encoder/set.c encoder/macroblock.c encoder/cabac.c encoder/cavlc.c \
encoder/encoder.c \
core/i386/mc-c.c core/i386/dct-c.c core/i386/predict.c \
common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c \
x264.c
AS= nasm
#for cygwin
ASFLAGS=-f win32 -DPREFIX $(PFLAGS)
ASMSRC= core/i386/dct.asm core/i386/cpu.asm core/i386/pixel.asm core/i386/mc.asm
ASMSRC= common/i386/dct.asm common/i386/cpu.asm common/i386/pixel.asm common/i386/mc.asm
OBJASM= $(ASMSRC:%.asm=%.o)
OBJS = $(SRCS:%.c=%.o)
......
build/cygwin/Makefile
View file @ b6954ba2
......@@ -14,15 +14,15 @@ DIR_CUR=$(shell pwd)
DIR_SRC=$(DIR_CUR)/../..
# Sources
SRC_C= core/mc.c core/predict.c core/pixel.c core/macroblock.c \
core/frame.c core/dct.c core/cpu.c core/cabac.c \
core/common.c core/mdate.c core/csp.c \
SRC_C= common/mc.c common/predict.c common/pixel.c common/macroblock.c \
common/frame.c common/dct.c common/cpu.c common/cabac.c \
common/common.c common/mdate.c common/csp.c \
encoder/analyse.c encoder/me.c encoder/ratecontrol.c \
encoder/set.c encoder/macroblock.c encoder/cabac.c encoder/cavlc.c \
encoder/encoder.c encoder/eval.c \
core/i386/mc-c.c core/i386/dct-c.c core/i386/predict.c
common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
SRC_ASM= core/i386/dct.asm core/i386/cpu.asm core/i386/pixel.asm core/i386/mc.asm
SRC_ASM= common/i386/dct.asm common/i386/cpu.asm common/i386/pixel.asm common/i386/mc.asm
# Alias
RM= rm -rf
......
build/win32/libx264.dsp
View file @ b6954ba2
......@@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "./core" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /D "ARCH_X86" /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /D "ARCH_X86" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x804 /d "NDEBUG"
# ADD RSC /l 0x804 /d "NDEBUG"
......@@ -65,7 +65,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "./core" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /D "ARCH_X86" /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /D "ARCH_X86" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x804 /d "_DEBUG"
# ADD RSC /l 0x804 /d "_DEBUG"
......@@ -253,59 +253,59 @@ SOURCE=..\..\encoder\set.c
# PROP Default_Filter ".h"
# Begin Source File
SOURCE=..\..\core\bs.h
SOURCE=..\..\common\bs.h
# End Source File
# Begin Source File
SOURCE=..\..\core\cabac.h
SOURCE=..\..\common\cabac.h
# End Source File
# Begin Source File
SOURCE=..\..\core\clip1.h
SOURCE=..\..\common\clip1.h
# End Source File
# Begin Source File
SOURCE=..\..\core\common.h
SOURCE=..\..\common\common.h
# End Source File
# Begin Source File
SOURCE=..\..\core\cpu.h
SOURCE=..\..\common\cpu.h
# End Source File
# Begin Source File
SOURCE=..\..\core\csp.h
SOURCE=..\..\common\csp.h
# End Source File
# Begin Source File
SOURCE=..\..\core\dct.h
SOURCE=..\..\common\dct.h
# End Source File
# Begin Source File
SOURCE=..\..\core\frame.h
SOURCE=..\..\common\frame.h
# End Source File
# Begin Source File
SOURCE=..\..\core\macroblock.h
SOURCE=..\..\common\macroblock.h
# End Source File
# Begin Source File
SOURCE=..\..\core\mc.h
SOURCE=..\..\common\mc.h
# End Source File
# Begin Source File
SOURCE=..\..\core\pixel.h
SOURCE=..\..\common\pixel.h
# End Source File
# Begin Source File
SOURCE=..\..\core\predict.h
SOURCE=..\..\common\predict.h
# End Source File
# Begin Source File
SOURCE=..\..\core\set.h
SOURCE=..\..\common\set.h
# End Source File
# Begin Source File
SOURCE=..\..\core\vlc.h
SOURCE=..\..\common\vlc.h
# End Source File
# End Group
# Begin Group "I386"
......@@ -313,13 +313,13 @@ SOURCE=..\..\core\vlc.h
# PROP Default_Filter "*.h,*.c,*.asm"
# Begin Source File
SOURCE=..\..\core\i386\cpu.asm
SOURCE=..\..\common\i386\cpu.asm
!IF "$(CFG)" == "libx264 - Win32 Release"
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Release
InputPath=..\..\core\i386\cpu.asm
InputPath=..\..\common\i386\cpu.asm
InputName=cpu
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
......@@ -331,7 +331,7 @@ InputName=cpu
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Debug
InputPath=..\..\core\i386\cpu.asm
InputPath=..\..\common\i386\cpu.asm
InputName=cpu
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
......@@ -344,17 +344,17 @@ InputName=cpu
# End Source File
# Begin Source File
SOURCE="..\..\core\i386\dct-c.c"
SOURCE="..\..\common\i386\dct-c.c"
# End Source File
# Begin Source File
SOURCE=..\..\core\i386\dct.asm
SOURCE=..\..\common\i386\dct.asm
!IF "$(CFG)" == "libx264 - Win32 Release"
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Release
InputPath=..\..\core\i386\dct.asm
InputPath=..\..\common\i386\dct.asm
InputName=dct
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
......@@ -366,7 +366,7 @@ InputName=dct
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Debug
InputPath=..\..\core\i386\dct.asm
InputPath=..\..\common\i386\dct.asm
InputName=dct
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
......@@ -379,11 +379,11 @@ InputName=dct
# End Source File
# Begin Source File
SOURCE=..\..\core\i386\dct.h
SOURCE=..\..\common\i386\dct.h
# End Source File
# Begin Source File
SOURCE="..\..\core\i386\mc-c.c"
SOURCE="..\..\common\i386\mc-c.c"
!IF "$(CFG)" == "libx264 - Win32 Release"
......@@ -396,13 +396,13 @@ SOURCE="..\..\core\i386\mc-c.c"
# End Source File
# Begin Source File
SOURCE=..\..\core\i386\mc.asm
SOURCE=..\..\common\i386\mc.asm
!IF "$(CFG)" == "libx264 - Win32 Release"
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Release
InputPath=..\..\core\i386\mc.asm
InputPath=..\..\common\i386\mc.asm
InputName=mc
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
......@@ -414,7 +414,7 @@ InputName=mc
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Debug
InputPath=..\..\core\i386\mc.asm
InputPath=..\..\common\i386\mc.asm
InputName=mc
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
......@@ -427,13 +427,13 @@ InputName=mc
# End Source File
# Begin Source File
SOURCE=..\..\core\i386\pixel.asm
SOURCE=..\..\common\i386\pixel.asm
!IF "$(CFG)" == "libx264 - Win32 Release"
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Release
InputPath=..\..\core\i386\pixel.asm
InputPath=..\..\common\i386\pixel.asm
InputName=pixel
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
......@@ -445,7 +445,7 @@ InputName=pixel
# Begin Custom Build - Assembly $(InputPath)
IntDir=.\Debug
InputPath=..\..\core\i386\pixel.asm
InputPath=..\..\common\i386\pixel.asm
InputName=pixel
"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
......@@ -458,12 +458,12 @@ InputName=pixel
# End Source File
# Begin Source File
SOURCE=..\..\core\i386\pixel.h
SOURCE=..\..\common\i386\pixel.h
# End Source File
# End Group
# Begin Source File
SOURCE=..\..\core\cabac.c
SOURCE=..\..\common\cabac.c
!IF "$(CFG)" == "libx264 - Win32 Release"
......@@ -478,7 +478,7 @@ SOURCE=..\..\core\cabac.c
# End Source File
# Begin Source File
SOURCE=..\..\core\common.c
SOURCE=..\..\common\common.c
!IF "$(CFG)" == "libx264 - Win32 Release"
......@@ -493,7 +493,7 @@ SOURCE=..\..\core\common.c
# End Source File
# Begin Source File
SOURCE=..\..\core\cpu.c
SOURCE=..\..\common\cpu.c
!IF "$(CFG)" == "libx264 - Win32 Release"
......@@ -508,11 +508,11 @@ SOURCE=..\..\core\cpu.c
# End Source File
# Begin Source File
SOURCE=..\..\core\csp.c
SOURCE=..\..\common\csp.c
# End Source File
# Begin Source File
SOURCE=..\..\core\dct.c
SOURCE=..\..\common\dct.c
!IF "$(CFG)" == "libx264 - Win32 Release"
......@@ -527,7 +527,7 @@ SOURCE=..\..\core\dct.c
# End Source File
# Begin Source File
SOURCE=..\..\core\frame.c
SOURCE=..\..\common\frame.c
!IF "$(CFG)" == "libx264 - Win32 Release"
......@@ -542,7 +542,7 @@ SOURCE=..\..\core\frame.c
# End Source File
# Begin Source File
SOURCE=..\..\core\macroblock.c
SOURCE=..\..\common\macroblock.c
!IF "$(CFG)" == "libx264 - Win32 Release"
......@@ -557,7 +557,7 @@ SOURCE=..\..\core\macroblock.c
# End Source File
# Begin Source File
SOURCE=..\..\core\mc.c
SOURCE=..\..\common\mc.c
!IF "$(CFG)" == "libx264 - Win32 Release"
......@@ -572,7 +572,7 @@ SOURCE=..\..\core\mc.c
# End Source File
# Begin Source File
SOURCE=..\..\core\mdate.c
SOURCE=..\..\common\mdate.c
!IF "$(CFG)" == "libx264 - Win32 Release"
......@@ -587,7 +587,7 @@ SOURCE=..\..\core\mdate.c
# End Source File
# Begin Source File
SOURCE=..\..\core\pixel.c
SOURCE=..\..\common\pixel.c
!IF "$(CFG)" == "libx264 - Win32 Release"
......@@ -602,7 +602,7 @@ SOURCE=..\..\core\pixel.c
# End Source File
# Begin Source File
SOURCE=..\..\core\predict.c
SOURCE=..\..\common\predict.c
!IF "$(CFG)" == "libx264 - Win32 Release"
......
build/win32/x264.dsp
View file @ b6954ba2
......@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "./core" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /YX /FD /c
# ADD BASE RSC /l 0x804 /d "NDEBUG"
# ADD RSC /l 0x804 /d "NDEBUG"
BSC32=bscmake.exe
......@@ -66,7 +66,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../core" /I "../../encode" /I "../../decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../common" /I "../../encode" /I "../../decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /YX /FD /GZ /c
# ADD BASE RSC /l 0x804 /d "_DEBUG"
# ADD RSC /l 0x804 /d "_DEBUG"
BSC32=bscmake.exe
......
decoder/decoder.c
View file @ b6954ba2
......@@ -26,9 +26,9 @@
#include <string.h>
#include <stdint.h>
#include "../core/common.h"
#include "../core/cpu.h"
#include "../core/vlc.h"
#include "../common/common.h"
#include "../common/cpu.h"
#include "../common/vlc.h"
#include "macroblock.h"
#include "set.h"
......
decoder/macroblock.c
View file @ b6954ba2
......@@ -26,8 +26,8 @@
#include <string.h>
#include <stdint.h>
#include "../core/common.h"
#include "../core/vlc.h"
#include "../common/common.h"
#include "../common/vlc.h"
#include "vlc.h"
#include "macroblock.h"
......
decoder/set.c
View file @ b6954ba2
......@@ -26,7 +26,7 @@
#include <string.h>
#include <stdint.h>
#include "../core/common.h"
#include "../common/common.h"
#include "set.h"
/* return -1 if invalid, else the id */
......
decoder/vlc.c
View file @ b6954ba2
......@@ -25,8 +25,8 @@
#include <stdio.h>
#include <inttypes.h>
#include "../core/common.h"
#include "../core/vlc.h"
#include "../common/common.h"
#include "../common/vlc.h"
#include "vlc.h"
......
encoder/analyse.c
View file @ b6954ba2
......@@ -27,8 +27,8 @@
#include <math.h>
#include <limits.h>
#include "../core/common.h"
#include "../core/macroblock.h"
#include "../common/common.h"
#include "../common/macroblock.h"
#include "macroblock.h"
#include "me.h"
#include "ratecontrol.h"
......
encoder/cabac.c
View file @ b6954ba2
......@@ -25,7 +25,7 @@
#include <stdio.h>
#include <string.h>
#include "../core/common.h"
#include "../common/common.h"
#include "macroblock.h"
static const uint8_t block_idx_x[16] =
......
encoder/cavlc.c
View file @ b6954ba2
......@@ -25,8 +25,8 @@
#include <stdio.h>
#include <string.h>
#include "../core/common.h"
#include "../core/vlc.h"
#include "../common/common.h"
#include "../common/vlc.h"
#include "macroblock.h"
static const uint8_t intra4x4_cbp_to_golomb[48]=
......
encoder/encoder.c
View file @ b6954ba2
......@@ -27,8 +27,8 @@
#include <math.h>
#include "../core/common.h"
#include "../core/cpu.h"
#include "../common/common.h"
#include "../common/cpu.h"
#include "set.h"
#include "analyse.h"
......
encoder/macroblock.c
View file @ b6954ba2
......@@ -25,7 +25,7 @@
#include <stdio.h>
#include <string.h>
#include "../core/common.h"
#include "../common/common.h"
#include "macroblock.h"
......
encoder/macroblock.h
View file @ b6954ba2
......@@ -24,7 +24,7 @@
#ifndef _ENCODER_MACROBLOCK_H
#define _ENCODER_MACROBLOCK_H 1
#include "../core/macroblock.h"
#include "../common/macroblock.h"
int x264_macroblock_probe_pskip( x264_t *h );
......
encoder/me.c
View file @ b6954ba2
......@@ -25,7 +25,7 @@
#include <stdio.h>
#include <string.h>
#include "../core/common.h"
#include "../common/common.h"
#include "me.h"
/* presets selected from good points on the speed-vs-quality curve of several test videos
......
encoder/ratecontrol.c
View file @ b6954ba2
......@@ -32,9 +32,9 @@
#include <limits.h>
#include <assert.h>
#include "../core/common.h"
#include "../core/cpu.h"
#include "../core/macroblock.h"
#include "../common/common.h"
#include "../common/cpu.h"
#include "../common/macroblock.h"
#include "ratecontrol.h"
#ifdef SYS_MACOSX
......
encoder/set.c
View file @ b6954ba2
......@@ -32,8 +32,8 @@
#include <stdarg.h>
#include "../x264.h"