mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 18:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

codecparsers: avoid libc math library

Browse source 
Instead of the libc ceil() and pow() machinery for double types, since the
library uses it for unsigned integers use a simple math function for for ceil
division and bit left shift for integer power of two.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7869>
This commit is contained in:
Víctor Manuel Jáquez Leal 2024-11-11 17:47:48 +01:00 committed by GStreamer Marge Bot
parent ff9100eb4d
commit e60efa4b9a
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gsth265bitwriter.c
View file

@ -25,7 +25,6 @@
#include "gsth265bitwriter.h" #include "gsth265bitwriter.h"
#include "nalutils.h" #include "nalutils.h"
#include <gst/base/gstbitwriter.h> #include <gst/base/gstbitwriter.h>
#include <math.h>
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
#define GST_CAT_DEFAULT gst_h265_debug_category_get() #define GST_CAT_DEFAULT gst_h265_debug_category_get()
@ -1566,10 +1565,8 @@ _h265_bit_writer_slice_header (const GstH265SliceHdr * slice,
CtbLog2SizeY = CtbLog2SizeY =
MinCbLog2SizeY + sps->log2_diff_max_min_luma_coding_block_size; MinCbLog2SizeY + sps->log2_diff_max_min_luma_coding_block_size;
CtbSizeY = 1 << CtbLog2SizeY; CtbSizeY = 1 << CtbLog2SizeY;
PicHeightInCtbsY = PicHeightInCtbsY = div_ceil (sps->pic_height_in_luma_samples, CtbSizeY);
ceil ((gdouble) sps->pic_height_in_luma_samples / (gdouble) CtbSizeY); PicWidthInCtbsY = div_ceil (sps->pic_width_in_luma_samples, CtbSizeY);
PicWidthInCtbsY =
ceil ((gdouble) sps->pic_width_in_luma_samples / (gdouble) CtbSizeY);
PicSizeInCtbsY = PicWidthInCtbsY * PicHeightInCtbsY; PicSizeInCtbsY = PicWidthInCtbsY * PicHeightInCtbsY;
n = gst_util_ceil_log2 (PicSizeInCtbsY); n = gst_util_ceil_log2 (PicSizeInCtbsY);

14
subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gsth265parser.c
View file

@ -70,7 +70,6 @@
#include <gst/base/gstbytereader.h> #include <gst/base/gstbytereader.h>
#include <gst/base/gstbitreader.h> #include <gst/base/gstbitreader.h>
#include <string.h> #include <string.h>
#include <math.h>
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
#define GST_CAT_DEFAULT gst_h265_debug_category_get() #define GST_CAT_DEFAULT gst_h265_debug_category_get()
@ -1180,7 +1179,7 @@ gst_h265_parser_parse_recovery_point (GstH265Parser * parser,
goto error; goto error;
} }
max_pic_order_cnt_lsb = pow (2, (sps->log2_max_pic_order_cnt_lsb_minus4 + 4)); max_pic_order_cnt_lsb = 1 << (sps->log2_max_pic_order_cnt_lsb_minus4 + 4);
READ_SE_ALLOWED (nr, rp->recovery_poc_cnt, -max_pic_order_cnt_lsb / 2, READ_SE_ALLOWED (nr, rp->recovery_poc_cnt, -max_pic_order_cnt_lsb / 2,
max_pic_order_cnt_lsb - 1); max_pic_order_cnt_lsb - 1);
READ_UINT8 (nr, rp->exact_match_flag, 1); READ_UINT8 (nr, rp->exact_match_flag, 1);
@ -2375,9 +2374,8 @@ gst_h265_parse_pps (GstH265Parser * parser, GstH265NalUnit * nalu,
MinCbLog2SizeY + sps->log2_diff_max_min_luma_coding_block_size; MinCbLog2SizeY + sps->log2_diff_max_min_luma_coding_block_size;
CtbSizeY = 1 << CtbLog2SizeY; CtbSizeY = 1 << CtbLog2SizeY;
pps->PicHeightInCtbsY = pps->PicHeightInCtbsY =
ceil ((gdouble) sps->pic_height_in_luma_samples / (gdouble) CtbSizeY); div_ceil (sps->pic_height_in_luma_samples, CtbSizeY);
pps->PicWidthInCtbsY = pps->PicWidthInCtbsY = div_ceil (sps->pic_width_in_luma_samples, CtbSizeY);
ceil ((gdouble) sps->pic_width_in_luma_samples / (gdouble) CtbSizeY);
READ_UE_ALLOWED (&nr, READ_UE_ALLOWED (&nr,
pps->num_tile_columns_minus1, 0, pps->PicWidthInCtbsY - 1); pps->num_tile_columns_minus1, 0, pps->PicWidthInCtbsY - 1);
@ -2698,10 +2696,8 @@ gst_h265_parser_fill_pps (GstH265Parser * parser, GstH265PPS * pps)
MinCbLog2SizeY = sps->log2_min_luma_coding_block_size_minus3 + 3; MinCbLog2SizeY = sps->log2_min_luma_coding_block_size_minus3 + 3;
CtbLog2SizeY = MinCbLog2SizeY + sps->log2_diff_max_min_luma_coding_block_size; CtbLog2SizeY = MinCbLog2SizeY + sps->log2_diff_max_min_luma_coding_block_size;
CtbSizeY = 1 << CtbLog2SizeY; CtbSizeY = 1 << CtbLog2SizeY;
pps->PicHeightInCtbsY = pps->PicHeightInCtbsY = div_ceil (sps->pic_height_in_luma_samples, CtbSizeY);
ceil ((gdouble) sps->pic_height_in_luma_samples / (gdouble) CtbSizeY); pps->PicWidthInCtbsY = div_ceil (sps->pic_width_in_luma_samples, CtbSizeY);
pps->PicWidthInCtbsY =
ceil ((gdouble) sps->pic_width_in_luma_samples / (gdouble) CtbSizeY);
if (pps->init_qp_minus26 < -(26 + qp_bd_offset)) if (pps->init_qp_minus26 < -(26 + qp_bd_offset))
return GST_H265_PARSER_BROKEN_LINK; return GST_H265_PARSER_BROKEN_LINK;

2
subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/meson.build
View file

@ -58,7 +58,7 @@ gstcodecparsers = library('gstcodecparsers-' + api_version,
soversion : soversion, soversion : soversion,
darwin_versions : osxversion, darwin_versions : osxversion,
install : true, install : true,
dependencies : [gstbase_dep, libm], dependencies : [gstbase_dep],
) )
pkg_name = 'gstreamer-codecparsers-1.0' pkg_name = 'gstreamer-codecparsers-1.0'

7
subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/nalutils.h
View file

@ -261,3 +261,10 @@ gboolean count_exp_golomb_bits (guint32 value, guint * leading_zeros, guint * re
goto error; \ goto error; \
} \ } \
} }
static inline guint32 div_ceil (guint32 a, guint32 b)
{
/* http://blog.pkh.me/p/36-figuring-out-round%2C-floor-and-ceil-with-integer-division.html */
g_assert (b > 0);
return a / b + (a % b > 0);
}