ref: 42cc716395778244d07ad2dff278bccc4ed46b07
parent: ab2e5fe20760049c97f9d40af55353c4c2819056
parent: e565e50d4d1a94cc1e950054edc99ac7a438d16b
author: Licai Guo <[email protected]>
date: Thu Feb 20 09:46:05 EST 2014
Merge pull request #324 from volvet/add-missed-namespace-for-encoder add missed namespace for encoder, remove un-used file
--- a/codec/encoder/core/inc/bit_stream.h
+++ b/codec/encoder/core/inc/bit_stream.h
@@ -35,6 +35,8 @@
#define WELS_BIT_STREAM_H__
#include "typedefs.h"
+
+namespace WelsSVCEnc {//#include "macros.h"
/*
@@ -70,5 +72,6 @@
return kiSize;
}
+}
#endif//WELS_BIT_STREAM_H__
--- a/codec/encoder/core/inc/dq_map.h
+++ b/codec/encoder/core/inc/dq_map.h
@@ -42,6 +42,7 @@
#if !defined(WELS_ENCODER_DEPENDENCY_QUAILITY_IDC_MAP_H__)
#define WELS_ENCODER_DEPENDENCY_QUAILITY_IDC_MAP_H__
+namespace WelsSVCEnc {/*
* Dependency Quality IDC
*/
@@ -51,5 +52,7 @@
uint8_t iSpsId; // pSps id
int8_t uiSpatialId; // spatial id
} SDqIdc;
+
+}
#endif//WELS_ENCODER_DEPENDENCY_QUAILITY_IDC_MAP_H__
--- a/codec/encoder/core/inc/stat.h
+++ b/codec/encoder/core/inc/stat.h
@@ -40,6 +40,8 @@
#if !defined(WELS_ENCODER_STATISTICAL_DATA_H__)
#define WELS_ENCODER_STATISTICAL_DATA_H__
+namespace WelsSVCEnc {+
/*
* Stat quality
*/
@@ -94,5 +96,7 @@
SStatSliceInfo sSliceData;
} SStatData;
+
+}
#endif//WELS_ENCODER_STATISTICAL_DATA_H__
--- a/codec/encoder/core/inc/trace.h
+++ /dev/null
@@ -1,68 +1,0 @@
-/*!
- * \copy
- * Copyright (c) 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.
- *
- */
-
-#ifndef TRACE_H_
-#define TRACE_H_
-
-#include "typedefs.h"
-#include "bit_stream.h"
-#include <stdio.h>
-
-
-#define TRACE_MB_ID(fp, value) \
- {\- fprintf(fp, "----------MB index: %d ----------\n", value);\
- fflush(fp);\
- }
-#define TRACE_FRAME_ID(fp, value) \
- {\- fprintf(fp, "----------Frame index: %d ----------\n", value);\
- fflush(fp);\
- }
-
-#define TRACE_VALUE(fp, value) \
- {\- fprintf(fp, "(%d)\n", value);\
- fflush(fp);\
- }
-#define TRACE_VALUE_2(fp, value1, value2) \
- {\- fprintf(fp, "(%d,%d)\n", value1, value2);\
- fflush(fp);\
- }
-
-void TraceName (FILE* pFp, int8_t* pName, SBitStringAux* pBs);
-
-void TraceBits (FILE* pFp, uint32_t uiStart, uint32_t uiEnd, SBitStringAux* pBs);
-
-
-#endif