mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-22 23:28:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

tsdemux: provide our own definition of log2()

Browse source 
The log2 function/macro doesn't exist when targetting android API < 18 (or MSVC
< 2013) whereas our current baseline is API 9.
This commit is contained in:
Matthew Waters 2015-11-10 17:58:58 +11:00
parent 50b59150fd
commit ac9a2971bd
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/mpegtsdemux/tsdemux.c
View file

@ -51,6 +51,8 @@
#include <math.h>
#define _gst_log2(x) (log(x)/log(2))
/*
* tsdemux
*
@ -1297,7 +1299,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream,
(&br, gst_byte_reader_get_remaining
(&br)), gst_byte_reader_get_remaining (&br));
stream_count_minus_one_len = ceil (log2 (channels));
stream_count_minus_one_len = ceil (_gst_log2 (channels));
if (!gst_bit_reader_get_bits_uint8 (&breader,
&stream_count_minus_one,
stream_count_minus_one_len)) {
@ -1309,7 +1311,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream,
stream_count = stream_count_minus_one + 1;
coupled_stream_count_len =
ceil (log2 (stream_count_minus_one + 2));
ceil (_gst_log2 (stream_count_minus_one + 2));
if (!gst_bit_reader_get_bits_uint8 (&breader,
&coupled_stream_count, coupled_stream_count_len)) {
@ -1322,7 +1324,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream,
coupled_count = coupled_stream_count;
channel_mapping_len =
ceil (log2 (stream_count_minus_one + 1 +
ceil (_gst_log2 (stream_count_minus_one + 1 +
coupled_stream_count + 1));
channel_mapping = g_new0 (guint8, channels);
for (i = 0; i < channels; i++) {