Commit a22ae9f0 authored by Ben Avison's avatar Ben Avison Committed by Martin Storsjö

mpegts: Remove one 64-bit integer modulus operation per packet

The common case of the pointer having increased by one packet (which results
in no change to the modulus) can be detected with a 64-bit subtraction,
which is far cheaper than a division on many platforms.

           Before          After
           Mean   StdDev   Mean   StdDev  Change
Divisions   248.3  8.8      51.5   7.4    +381.7%
Overall    2773.2 25.6     2372.5 43.1     +16.9%
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent 43bacd5b
...@@ -195,6 +195,15 @@ if ((y) < (x)) {\ ...@@ -195,6 +195,15 @@ if ((y) < (x)) {\
# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32)) # define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32))
#endif /* FASTDIV */ #endif /* FASTDIV */
#ifndef MOD_UNLIKELY
# define MOD_UNLIKELY(modulus, dividend, divisor, prev_dividend) \
do { \
if ((prev_dividend) == 0 || (dividend) - (prev_dividend) != (divisor)) \
(modulus) = (dividend) % (divisor); \
(prev_dividend) = (dividend); \
} while (0)
#endif
static inline av_const unsigned int ff_sqrt(unsigned int a) static inline av_const unsigned int ff_sqrt(unsigned int a)
{ {
unsigned int b; unsigned int b;
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
#include "libavcodec/get_bits.h" #include "libavcodec/get_bits.h"
#include "libavcodec/mathops.h"
#include "avformat.h" #include "avformat.h"
#include "mpegts.h" #include "mpegts.h"
#include "internal.h" #include "internal.h"
...@@ -98,6 +99,8 @@ struct MpegTSContext { ...@@ -98,6 +99,8 @@ struct MpegTSContext {
int raw_packet_size; int raw_packet_size;
int pos47; int pos47;
/** position corresponding to pos47, or 0 if pos47 invalid */
int64_t pos;
/** if true, all pids are analyzed to find streams */ /** if true, all pids are analyzed to find streams */
int auto_guess; int auto_guess;
...@@ -1694,7 +1697,7 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet) ...@@ -1694,7 +1697,7 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet)
return 0; return 0;
pos = avio_tell(ts->stream->pb); pos = avio_tell(ts->stream->pb);
ts->pos47= pos % ts->raw_packet_size; MOD_UNLIKELY(ts->pos47, pos, ts->raw_packet_size, ts->pos);
if (tss->type == MPEGTS_SECTION) { if (tss->type == MPEGTS_SECTION) {
if (is_start) { if (is_start) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment