ref: 5ff8af6883d41616d846e82506638c2576e1b13a
parent: 6239fbe131bbcaa71269f02bd28f228a28f7395a
author: Martin Storsjö <[email protected]>
date: Tue Oct 13 08:21:34 EDT 2015
Remove unused source files from the encoder
--- a/codec/build/iOS/enc/welsenc/welsenc.xcodeproj/project.pbxproj
+++ b/codec/build/iOS/enc/welsenc/welsenc.xcodeproj/project.pbxproj
@@ -28,7 +28,6 @@
4CE4471A18BC605C0017DF25 /* mv_pred.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446E918BC605C0017DF25 /* mv_pred.cpp */; }; 4CE4471B18BC605C0017DF25 /* nal_encap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446EA18BC605C0017DF25 /* nal_encap.cpp */; }; 4CE4471C18BC605C0017DF25 /* picture_handle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446EB18BC605C0017DF25 /* picture_handle.cpp */; };- 4CE4471D18BC605C0017DF25 /* property.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446EC18BC605C0017DF25 /* property.cpp */; }; 4CE4471E18BC605C0017DF25 /* ratectl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446ED18BC605C0017DF25 /* ratectl.cpp */; }; 4CE4471F18BC605C0017DF25 /* ref_list_mgr_svc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446EE18BC605C0017DF25 /* ref_list_mgr_svc.cpp */; }; 4CE4472018BC605C0017DF25 /* sample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE446EF18BC605C0017DF25 /* sample.cpp */; };@@ -98,7 +97,6 @@
4CE446C018BC605C0017DF25 /* parameter_sets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parameter_sets.h; sourceTree = "<group>"; }; 4CE446C118BC605C0017DF25 /* picture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = picture.h; sourceTree = "<group>"; }; 4CE446C218BC605C0017DF25 /* picture_handle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = picture_handle.h; sourceTree = "<group>"; };- 4CE446C318BC605C0017DF25 /* property.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = property.h; sourceTree = "<group>"; }; 4CE446C418BC605C0017DF25 /* rc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rc.h; sourceTree = "<group>"; }; 4CE446C518BC605C0017DF25 /* ref_list_mgr_svc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ref_list_mgr_svc.h; sourceTree = "<group>"; }; 4CE446C618BC605C0017DF25 /* sample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sample.h; sourceTree = "<group>"; };@@ -133,7 +131,6 @@
4CE446E918BC605C0017DF25 /* mv_pred.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mv_pred.cpp; sourceTree = "<group>"; }; 4CE446EA18BC605C0017DF25 /* nal_encap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nal_encap.cpp; sourceTree = "<group>"; }; 4CE446EB18BC605C0017DF25 /* picture_handle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = picture_handle.cpp; sourceTree = "<group>"; };- 4CE446EC18BC605C0017DF25 /* property.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = property.cpp; sourceTree = "<group>"; }; 4CE446ED18BC605C0017DF25 /* ratectl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ratectl.cpp; sourceTree = "<group>"; }; 4CE446EE18BC605C0017DF25 /* ref_list_mgr_svc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ref_list_mgr_svc.cpp; sourceTree = "<group>"; }; 4CE446EF18BC605C0017DF25 /* sample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sample.cpp; sourceTree = "<group>"; };@@ -277,7 +274,6 @@
4CE446C018BC605C0017DF25 /* parameter_sets.h */,
4CE446C118BC605C0017DF25 /* picture.h */,
4CE446C218BC605C0017DF25 /* picture_handle.h */,
- 4CE446C318BC605C0017DF25 /* property.h */,
4CE446C418BC605C0017DF25 /* rc.h */,
4CE446C518BC605C0017DF25 /* ref_list_mgr_svc.h */,
4CE446C618BC605C0017DF25 /* sample.h */,
@@ -322,7 +318,6 @@
4CE446E918BC605C0017DF25 /* mv_pred.cpp */,
4CE446EA18BC605C0017DF25 /* nal_encap.cpp */,
4CE446EB18BC605C0017DF25 /* picture_handle.cpp */,
- 4CE446EC18BC605C0017DF25 /* property.cpp */,
4CE446ED18BC605C0017DF25 /* ratectl.cpp */,
4CE446EE18BC605C0017DF25 /* ref_list_mgr_svc.cpp */,
4CE446EF18BC605C0017DF25 /* sample.cpp */,
@@ -424,7 +419,6 @@
4CE4471118BC605C0017DF25 /* encode_mb_aux.cpp in Sources */,
4CE4472718BC605C0017DF25 /* svc_mode_decision.cpp in Sources */,
4CE4472818BC605C0017DF25 /* svc_motion_estimate.cpp in Sources */,
- 4CE4471D18BC605C0017DF25 /* property.cpp in Sources */,
4CE4471018BC605C0017DF25 /* decode_mb_aux.cpp in Sources */,
4CE4472018BC605C0017DF25 /* sample.cpp in Sources */,
6CA38DA31991CACE003EAAE0 /* svc_motion_estimation.S in Sources */,
--- a/codec/build/win32/enc/WelsEncCore.vcproj
+++ b/codec/build/win32/enc/WelsEncCore.vcproj
@@ -410,10 +410,6 @@
>
</File>
<File
- RelativePath="..\..\..\encoder\core\src\property.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\encoder\core\src\ratectl.cpp"
>
</File>
@@ -604,10 +600,6 @@
</File>
<File
RelativePath="..\..\..\encoder\core\inc\picture_handle.h"
- >
- </File>
- <File
- RelativePath="..\..\..\encoder\core\inc\property.h"
>
</File>
<File
--- a/codec/encoder/core/inc/property.h
+++ /dev/null
@@ -1,80 +1,0 @@
-/*!
- * \copy
- * Copyright (c) 2009-2013, Cisco Systems
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *
- * \file property.h
- *
- * \brief CODE name, library module and corresponding version are included
- *
- * \date 03/10/2009 Created
- *
- *************************************************************************************
- */
-#ifndef WELS_DECODER_PROPERTY_H__
-#define WELS_DECODER_PROPERTY_H__
-
-#include "typedefs.h"
-
-namespace WelsEnc {-
-
-/*!
- * \brief get code name
- * \param pBuf pBuffer to restore code name
- * \param iSize size of pBuffer overall
- * \return actual size of pBuffer used; 0 returned in failure
- */
-int32_t GetCodeName (char* pBuf, int32_t iSize);
-
-/*!
- * \brief get library/module name
- * \param pBuf pBuffer to restore module name
- * \param iSize size of pBuffer overall
- * \return actual size of pBuffer used; 0 returned in failure
- */
-int32_t GetLibName (char* pBuf, int32_t iSize);
-
-/*!
- * \brief get version number
- * \param pBuf pBuffer to restore version number
- * \param iSize size of pBuffer overall
- * \return actual size of pBuffer used; 0 returned in failure
- */
-int32_t GetVerNum (char* pBuf, int32_t iSize);
-
-/*!
- * \brief get identify information
- * \param pBuf pBuffer to restore indentify information
- * \param iSize size of pBuffer overall
- * \return actual size of pBuffer used; 0 returned in failure
- */
-int32_t GetIdentInfo (char* pBuf, int32_t iSize);
-}
-#endif//WELS_DECODER_PROPERTY_H__
--- a/codec/encoder/core/src/property.cpp
+++ /dev/null
@@ -1,139 +1,0 @@
-/*!
- * \copy
- * Copyright (c) 2009-2013, Cisco Systems
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *
- * \file property.c
- *
- * \brief CODE name, library module and corresponding version are included
- *
- * \date 03/10/2009 Created
- *
- *************************************************************************************
- */
-#include "property.h"
-#include "crt_util_safe_x.h" // Safe CRT routines like utils for cross_platforms
-namespace WelsEnc {-#define WELS_CODE_NAME "Wels"
-#define WELS_LIB_NAME "Encoder"
-
-#define WELS_VERSION_INT 0x000001 // v 0.0.1
-#define WELS_VERSION_STR "0.0.1"
-
-#define WELS_BUILD_NUM "090420" // yymmdd
-
-//////////////summary information//////////////
-
-#define WELS_IDENT WELS_CODE_NAME WELS_LIB_NAME "v" WELS_VERSION_STR "b" WELS_BUILD_NUM
-
-/*!
- * \brief get code name
- * \param pBuf pBuffer to restore code name
- * \param iSize size of pBuffer overall
- * \return actual size of pBuffer used; 0 returned in failure
- */
-int32_t GetCodeName (char* pBuf, int32_t iSize) {- int32_t iLen = 0;
-
- if (NULL == pBuf)
- return 0;
-
- iLen = (int32_t)strlen (WELS_CODE_NAME); // confirmed_safe_unsafe_usage
- if (iSize <= iLen)
- return 0;
-
- WelsStrncpy (pBuf, iSize, WELS_CODE_NAME); // confirmed_safe_unsafe_usage
-
- return iLen;
-}
-
-/*!
- * \brief get library/module name
- * \param pBuf pBuffer to restore module name
- * \param iSize size of pBuffer overall
- * \return actual size of pBuffer used; 0 returned in failure
- */
-int32_t GetLibName (char* pBuf, int32_t iSize) {- int32_t iLen = 0;
-
- if (NULL == pBuf)
- return 0;
-
- iLen = (int32_t)strlen (WELS_LIB_NAME); // confirmed_safe_unsafe_usage
- if (iSize <= iLen)
- return 0;
-
- WelsStrncpy (pBuf, iSize, WELS_LIB_NAME); // confirmed_safe_unsafe_usage
-
- return iLen;
-}
-
-/*!
- * \brief get version number
- * \param pBuf pBuffer to restore version number
- * \param iSize size of pBuffer overall
- * \return actual size of pBuffer used; 0 returned in failure
- */
-int32_t GetVerNum (char* pBuf, int32_t iSize) {- int32_t iLen = 0;
-
- if (NULL == pBuf)
- return 0;
-
- iLen = (int32_t)strlen (WELS_VERSION_STR); // confirmed_safe_unsafe_usage
- if (iSize <= iLen)
- return 0;
-
- WelsStrncpy (pBuf, iSize, WELS_VERSION_STR); // confirmed_safe_unsafe_usage
-
- return iLen;
-}
-
-/*!
- * \brief get identify information
- * \param pBuf pBuffer to restore indentify information
- * \param iSize size of pBuffer overall
- * \return actual size of pBuffer used; 0 returned in failure
- */
-int32_t GetIdentInfo (char* pBuf, int32_t iSize) {- int32_t iLen = 0;
-
- if (NULL == pBuf)
- return 0;
-
- iLen = (int32_t)strlen (WELS_IDENT); // confirmed_safe_unsafe_usage
- if (iSize <= iLen)
- return 0;
-
- WelsStrncpy (pBuf, iSize, WELS_IDENT); // confirmed_safe_unsafe_usage
-
- return iLen;
-}
-
-} // namespace WelsEnc
--- a/codec/encoder/targets.mk
+++ b/codec/encoder/targets.mk
@@ -12,7 +12,6 @@
$(ENCODER_SRCDIR)/core/src/mv_pred.cpp\
$(ENCODER_SRCDIR)/core/src/nal_encap.cpp\
$(ENCODER_SRCDIR)/core/src/picture_handle.cpp\
- $(ENCODER_SRCDIR)/core/src/property.cpp\
$(ENCODER_SRCDIR)/core/src/ratectl.cpp\
$(ENCODER_SRCDIR)/core/src/ref_list_mgr_svc.cpp\
$(ENCODER_SRCDIR)/core/src/sample.cpp\