generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove unused as264_common.h in decoder

Browse Source
This commit is contained in:
huili2
2015-03-10 15:48:37 +08:00
parent 698ba11bb6
commit a93e4647df
4 changed files with 1 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
codec/build/iOS/dec/welsdec/welsdec.xcodeproj/project.pbxproj
View File

@@ -54,7 +54,6 @@
4CE4427918B6FC360017DF25 /* libwelsdec.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwelsdec.a; sourceTree = BUILT_PRODUCTS_DIR; }; 4CE4427918B6FC360017DF25 /* libwelsdec.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwelsdec.a; sourceTree = BUILT_PRODUCTS_DIR; };
4CE4427C18B6FC360017DF25 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 4CE4427C18B6FC360017DF25 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
4CE4428D18B6FC360017DF25 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; 4CE4428D18B6FC360017DF25 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
4CE4464518BC5EAA0017DF25 /* as264_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = as264_common.h; sourceTree = "<group>"; };
4CE4464618BC5EAA0017DF25 /* au_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = au_parser.h; sourceTree = "<group>"; }; 4CE4464618BC5EAA0017DF25 /* au_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = au_parser.h; sourceTree = "<group>"; };
4CE4464718BC5EAA0017DF25 /* bit_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bit_stream.h; sourceTree = "<group>"; }; 4CE4464718BC5EAA0017DF25 /* bit_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bit_stream.h; sourceTree = "<group>"; };
4CE4464818BC5EAA0017DF25 /* deblocking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = deblocking.h; sourceTree = "<group>"; }; 4CE4464818BC5EAA0017DF25 /* deblocking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = deblocking.h; sourceTree = "<group>"; };
@@ -192,7 +191,6 @@
6A3E814019D79AD900C19C1F /* cabac_decoder.h */, 6A3E814019D79AD900C19C1F /* cabac_decoder.h */,
9AED665A1946A21D009A3567 /* utils.h */, 9AED665A1946A21D009A3567 /* utils.h */,
F0B204FA18FD23CF005DA23F /* error_concealment.h */, F0B204FA18FD23CF005DA23F /* error_concealment.h */,
4CE4464518BC5EAA0017DF25 /* as264_common.h */,
4CE4464618BC5EAA0017DF25 /* au_parser.h */, 4CE4464618BC5EAA0017DF25 /* au_parser.h */,
4CE4464718BC5EAA0017DF25 /* bit_stream.h */, 4CE4464718BC5EAA0017DF25 /* bit_stream.h */,
4CE4464818BC5EAA0017DF25 /* deblocking.h */, 4CE4464818BC5EAA0017DF25 /* deblocking.h */,

4
codec/build/win32/dec/WelsDecCore.vcproj
View File

@@ -640,10 +640,6 @@
Name="Header Files" Name="Header Files"
Filter="h;hpp;hxx;hm;inl" Filter="h;hpp;hxx;hm;inl"
> >
<File
RelativePath="..\..\..\decoder\core\inc\as264_common.h"
>
</File>
<File <File
RelativePath="..\..\..\decoder\core\inc\au_parser.h" RelativePath="..\..\..\decoder\core\inc\au_parser.h"
> >

42
codec/decoder/core/inc/as264_common.h
View File

@@ -1,42 +0,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 common.h
*
* \brief common flag definitions
*
* \date 7/6/2009 Created
*************************************************************************************
*/
#ifndef WELS_AS264_COMMON_H__
#define WELS_AS264_COMMON_H__
#define LONG_TERM_REF //for app
#endif // WELS_AS264_COMMON_H__

2
codec/decoder/core/inc/decoder_context.h
View File

@@ -51,7 +51,6 @@
#include "pic_queue.h" #include "pic_queue.h"
#include "vlc_decoder.h" #include "vlc_decoder.h"
#include "fmo.h" #include "fmo.h"
#include "as264_common.h" // for LONG_TERM_REF macro,can be delete if not need this macro
#include "crt_util_safe_x.h" #include "crt_util_safe_x.h"
#include "mb_cache.h" #include "mb_cache.h"
#include "expand_pic.h" #include "expand_pic.h"
@@ -63,6 +62,7 @@ namespace WelsDec {
#define MAX_PRED_MODE_ID_I4x4 8 #define MAX_PRED_MODE_ID_I4x4 8
#define WELS_QP_MAX 51 #define WELS_QP_MAX 51
#define LONG_TERM_REF
typedef struct SWels_Cabac_Element { typedef struct SWels_Cabac_Element {
uint8_t uiState; uint8_t uiState;
uint8_t uiMPS; uint8_t uiMPS;