diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 16:14:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 16:23:32 +0200 |
| commit | 0df55e1ba88600a14ed2bd5921fdf8279d63ae08 (patch) | |
| tree | 3ae5c6e44af564a24e924c938fb41eddb193300d | |
| parent | 91062ddef18e94d54e4b37b288c77c11947d8756 (diff) | |
| parent | a22ae9f0c579793f411e2bd7a8db557091a3a4ae (diff) | |
| download | ffmpeg-0df55e1ba88600a14ed2bd5921fdf8279d63ae08.tar.gz | |
Merge commit 'a22ae9f0c579793f411e2bd7a8db557091a3a4ae'
* commit 'a22ae9f0c579793f411e2bd7a8db557091a3a4ae':
mpegts: Remove one 64-bit integer modulus operation per packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mathops.h | 9 | ||||
| -rw-r--r-- | libavformat/mpegts.c | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index 592f5a5e75..1d573424f4 100644 --- a/libavcodec/mathops.h +++ b/libavcodec/mathops.h @@ -195,6 +195,15 @@ if ((y) < (x)) {\ # define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32)) #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) { unsigned int b; diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 896c96b6e8..b22ed8f13d 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -29,6 +29,7 @@ #include "libavutil/avassert.h" #include "libavcodec/bytestream.h" #include "libavcodec/get_bits.h" +#include "libavcodec/mathops.h" #include "avformat.h" #include "mpegts.h" #include "internal.h" @@ -99,6 +100,8 @@ struct MpegTSContext { int raw_packet_size; int pos47; + /** position corresponding to pos47, or 0 if pos47 invalid */ + int64_t pos; /** if true, all pids are analyzed to find streams */ int auto_guess; @@ -1857,7 +1860,7 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet) return 0; 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 (is_start) { |