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

Merge pull request #1651 from mstorsjo/improve-version-header

Browse Source 
Improve version header
This commit is contained in:
sijchen 2014-12-19 09:32:48 +08:00
commit 0dc461541a
7 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
codec/api/svc/codec_api.h
View File

@ -531,6 +531,11 @@ long WelsCreateDecoder (ISVCDecoder** ppDecoder);
*/ */
void WelsDestroyDecoder (ISVCDecoder* pDecoder); void WelsDestroyDecoder (ISVCDecoder* pDecoder);
/** @brief Get codec version
* @return The linked codec version
*/
OpenH264Version WelsGetCodecVersion ();
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
codec/api/svc/codec_app_def.h
View File

@ -70,7 +70,7 @@ typedef struct _tagVersion
unsigned int uMinor; ///< The minor version number unsigned int uMinor; ///< The minor version number
unsigned int uRevision; ///< The revision number unsigned int uRevision; ///< The revision number
unsigned int uReserved; ///< The reserved number, it should be 0. unsigned int uReserved; ///< The reserved number, it should be 0.
}Openh264Version; } OpenH264Version;
/** /**
* @brief Decoding status * @brief Decoding status

4
codec/api/svc/codec_ver.h
View File

@ -4,8 +4,8 @@
#include "codec_app_def.h" #include "codec_app_def.h"
static const Openh264Version g_stCodecVersion = {1,3,0,0}; static const OpenH264Version g_stCodecVersion = {1,3,0,0};
static const char* g_strCodecVer = "Openh264 version:1.3.0.0"; static const char* g_strCodecVer = "OpenH264 version:1.3.0.0";
#define OPENH264_MAJOR (1) #define OPENH264_MAJOR (1)
#define OPENH264_MINOR (3) #define OPENH264_MINOR (3)

8
codec/build/generate_codec_ver.sh
View File

@ -27,12 +27,12 @@ echo "" >>codec_ver.h
echo "#include \"codec_app_def.h\"" >>codec_ver.h echo "#include \"codec_app_def.h\"" >>codec_ver.h
echo "" >>codec_ver.h echo "" >>codec_ver.h
echo "static const Openh264Version g_stCodecVersion = {$1};"|tr '.' ',' >>codec_ver.h echo "static const OpenH264Version g_stCodecVersion = {$1};"|tr '.' ',' >>codec_ver.h
echo "static const char* g_strCodecVer = \"Openh264 version:$1\";" >>codec_ver.h echo "static const char* g_strCodecVer = \"OpenH264 version:$1\";" >>codec_ver.h
#if [ "$2"x = ""x ]; then #if [ "$2"x = ""x ]; then
#echo "static const char* g_strCodecBuildNum = \"Openh264 revision:$revision\";" >> codec_ver.h #echo "static const char* g_strCodecBuildNum = \"OpenH264 revision:$revision\";" >> codec_ver.h
#else #else
#echo "static const char* g_strCodecBuildNum = \"Openh264 build:$2, OpenH264 revision:$revision\";" >> codec_ver.h #echo "static const char* g_strCodecBuildNum = \"OpenH264 build:$2, OpenH264 revision:$revision\";" >> codec_ver.h
#fi #fi
echo "" >>codec_ver.h echo "" >>codec_ver.h

5
codec/encoder/plus/src/welsEncoderExt.cpp
View File

@ -40,6 +40,7 @@
#include "version.h" #include "version.h"
#include "crt_util_safe_x.h" // Safe CRT routines like util for cross platforms #include "crt_util_safe_x.h" // Safe CRT routines like util for cross platforms
#include "ref_list_mgr_svc.h" #include "ref_list_mgr_svc.h"
#include "codec_ver.h"
#include <time.h> #include <time.h>
#include <measure_time.h> #include <measure_time.h>
@ -1258,4 +1259,8 @@ void WelsDestroySVCEncoder (ISVCEncoder* pEncoder) {
pSVCEncoder = NULL; pSVCEncoder = NULL;
} }
} }
OpenH264Version WelsGetCodecVersion () {
return g_stCodecVersion;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////

3
codec/encoder/plus/src/wels_enc_export.def
View File

@ -1,3 +1,4 @@
EXPORTS EXPORTS
WelsCreateSVCEncoder WelsCreateSVCEncoder
WelsDestroySVCEncoder WelsDestroySVCEncoder
WelsGetCodecVersion

1
openh264.def
View File

@ -3,3 +3,4 @@ EXPORTS
WelsDestroyDecoder WelsDestroyDecoder
WelsCreateSVCEncoder WelsCreateSVCEncoder
WelsDestroySVCEncoder WelsDestroySVCEncoder
WelsGetCodecVersion