FS-7967 SmartOS compatibility

configure.ac: honor NetBSD and SmartOS in search for system lua
src/switch_utf8.c: remove switch_u8_vprintf and switch_u8_printf
replace u_int32_t with C99 standard uint32_t, and also the same for
  8,16,64 bit
This commit is contained in:
Stanislav Sinyagin
2015-09-09 21:23:18 +00:00
parent 4df2476564
commit 98a190a107
9 changed files with 29 additions and 69 deletions
+2 -2
View File
@@ -266,7 +266,7 @@ static void *SWITCH_THREAD_FUNC play_video_function(switch_thread_t *thread, voi
{
AVParams * pt = reinterpret_cast<AVParams*>(obj);
u_int next = 0, first = 0xffffffff;
u_int64_t ts = 0, control = 0;
uint64_t ts = 0, control = 0;
bool ok;
bool sent = true;
@@ -323,7 +323,7 @@ static void *SWITCH_THREAD_FUNC play_audio_function(switch_thread_t *thread, voi
{
AVParams * pt = reinterpret_cast<AVParams*>(obj);
u_int next = 0, first = 0xffffffff;
u_int64_t ts = 0, control = 0;
uint64_t ts = 0, control = 0;
bool ok;
bool sent = true;
+1 -1
View File
@@ -129,7 +129,7 @@ namespace MP4
}
ts = rt.last_frame;
if (!MP4ReadRtpPacket(fh, hint, rt.packet, (u_int8_t **) &buffer, &size, 0, header, true)) return false;
if (!MP4ReadRtpPacket(fh, hint, rt.packet, (uint8_t **) &buffer, &size, 0, header, true)) return false;
++rt.packet;
return true;
}
+7 -7
View File
@@ -56,10 +56,10 @@ namespace MP4
};
struct RuntimeProperties {
u_int32_t frame; // sampleID
u_int16_t packetsPerFrame;
u_int16_t packet; // packetID
u_int32_t last_frame; // timestamp
uint32_t frame; // sampleID
uint16_t packetsPerFrame;
uint16_t packet; // packetID
uint32_t last_frame; // timestamp
RuntimeProperties(): frame(0), packetsPerFrame(0), packet(0)
{
@@ -72,9 +72,9 @@ namespace MP4
MP4TrackId track;
char * codecName;
u_int8_t payload;
u_int32_t clock;
u_int32_t packetLength; // packet Length in time (ms)
uint8_t payload;
uint32_t clock;
uint32_t packetLength; // packet Length in time (ms)
RuntimeProperties runtime;
@@ -540,7 +540,7 @@ static inline unsigned int mul(unsigned int a, unsigned int b)
static inline unsigned int muldiv32(unsigned int a, unsigned int b,
unsigned int c, unsigned int *r)
{
u_int64_t n = (u_int64_t) a * b;
uint64_t n = (u_int64_t) a * b;
if (c == 0) {
snd_BUG_ON(!n);
*r = 0;
@@ -1094,7 +1094,7 @@ EXPORT_SYMBOL(snd_pcm_hw_rule_add);
* Apply the constraint of the given bitmap mask to a 32-bit mask parameter.
*/
int snd_pcm_hw_constraint_mask(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,
u_int32_t mask)
uint32_t mask)
{
struct snd_pcm_hw_constraints *constrs = &runtime->hw_constraints;
struct snd_mask *maskp = constrs_mask(constrs, var);
@@ -1114,12 +1114,12 @@ int snd_pcm_hw_constraint_mask(struct snd_pcm_runtime *runtime, snd_pcm_hw_param
* Apply the constraint of the given bitmap mask to a 64-bit mask parameter.
*/
int snd_pcm_hw_constraint_mask64(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,
u_int64_t mask)
uint64_t mask)
{
struct snd_pcm_hw_constraints *constrs = &runtime->hw_constraints;
struct snd_mask *maskp = constrs_mask(constrs, var);
maskp->bits[0] &= (u_int32_t)mask;
maskp->bits[1] &= (u_int32_t)(mask >> 32);
maskp->bits[0] &= (uint32_t)mask;
maskp->bits[1] &= (uint32_t)(mask >> 32);
memset(maskp->bits + 2, 0, (SNDRV_MASK_MAX-64) / 8); /* clear rest */
if (! maskp->bits[0] && ! maskp->bits[1])
return -EINVAL;
@@ -369,16 +369,16 @@ static int period_to_usecs(struct snd_pcm_runtime *runtime)
static int calc_boundary(struct snd_pcm_runtime *runtime)
{
u_int64_t boundary;
uint64_t boundary;
boundary = (u_int64_t)runtime->buffer_size *
(u_int64_t)runtime->period_size;
boundary = (uint64_t)runtime->buffer_size *
(uint64_t)runtime->period_size;
#if BITS_PER_LONG < 64
/* try to find lowest common multiple for buffer and period */
if (boundary > LONG_MAX - runtime->buffer_size) {
u_int32_t remainder = -1;
u_int32_t divident = runtime->buffer_size;
u_int32_t divisor = runtime->period_size;
uint32_t remainder = -1;
uint32_t divident = runtime->buffer_size;
uint32_t divisor = runtime->period_size;
while (remainder) {
remainder = divident % divisor;
if (remainder) {