• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 3edff185
    Michael Niedermayer authored
    * qatar/master: (21 commits)
      ipmovie: do not read audio packets before the codec is known
      truemotion2: check size before GetBitContext initialisation
      avio: Only do implicit network initialization for network protocols
      avio: Add an URLProtocol flag for indicating that a protocol uses network
      adpcm: ADPCM Electronic Arts has always two channels
      matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc()
      fate: Add missing reference file from 9b4767e4.
      mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions.
      4xm: Prevent buffer overreads.
      mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scan
      vp3: add fate test for non-zero last coefficient
      vp3: fix streams with non-zero last coefficient
      swscale: remove unused U/V arguments from yuv2rgb_write().
      timer: K&R formatting cosmetics
      lavf: cosmetics, reformat av_read_frame().
      lavf: refactor av_read_frame() to make it easier to understand.
      Report an error if pitch_lag is zero in AMR-NB decoder.
      Revert "4xm: Prevent buffer overreads."
      4xm: Prevent buffer overreads.
      4xm: pass the correct remaining buffer size to decode_i2_frame().
      ...
    
    Conflicts:
    	libavcodec/4xm.c
    	libavcodec/mjpegdec.c
    	libavcodec/truemotion2.c
    	libavformat/ipmovie.c
    	libavformat/mov_chan.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    3edff185
timer.h 2.83 KB
/*
 * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
 *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * FFmpeg is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with FFmpeg; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

/**
 * @file
 * high precision timer, useful to profile code
 */

#ifndef AVUTIL_TIMER_H
#define AVUTIL_TIMER_H

#include <stdlib.h>
#include <stdint.h>

#include "config.h"

#if   ARCH_ARM
#   include "arm/timer.h"
#elif ARCH_BFIN
#   include "bfin/timer.h"
#elif ARCH_PPC
#   include "ppc/timer.h"
#elif ARCH_X86
#   include "x86/timer.h"
#endif

#if !defined(AV_READ_TIME) && HAVE_GETHRTIME
#   define AV_READ_TIME gethrtime
#endif

#ifdef AV_READ_TIME
#define START_TIMER                             \
    uint64_t tend;                              \
    uint64_t tstart = AV_READ_TIME();           \

#define STOP_TIMER(id)                                                    \
    tend = AV_READ_TIME();                                                \
    {                                                                     \
        static uint64_t tsum   = 0;                                       \
        static int tcount      = 0;                                       \
        static int tskip_count = 0;                                       \
        if (tcount < 2                        ||                          \
            tend - tstart < 8 * tsum / tcount ||                          \
            tend - tstart < 2000) {                                       \
            tsum+= tend - tstart;                                         \
            tcount++;                                                     \
        } else                                                            \
            tskip_count++;                                                \
        if (((tcount + tskip_count) & (tcount + tskip_count - 1)) == 0) { \
            av_log(NULL, AV_LOG_ERROR,                                    \
                   "%"PRIu64" decicycles in %s, %d runs, %d skips\n",     \
                   tsum * 10 / tcount, id, tcount, tskip_count);          \
        }                                                                 \
    }
#else
#define START_TIMER
#define STOP_TIMER(id) { }
#endif

#endif /* AVUTIL_TIMER_H */