Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Apr 2012 20:26:42 +0000 (22:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Apr 2012 20:26:42 +0000 (22:26 +0200)
* qatar/master:
  ARM: allow runtime masking of CPU features
  dsputil: remove unused functions
  mov: Treat keyframe indexes as 1-origin if starting at non-zero.
  mov: Take stps entries into consideration also about key_off.
  Remove lowres video decoding

Conflicts:
ffmpeg.c
ffplay.c
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/libopenjpegdec.c
libavcodec/mjpegdec.c
libavcodec/mpegvideo.c
libavcodec/utils.c
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
46 files changed:
1  2 
cmdutils.c
ffplay.c
libavcodec/alpha/dsputil_alpha.c
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/arm/dcadsp_init_arm.c
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_init_vfp.c
libavcodec/arm/fft_fixed_init_arm.c
libavcodec/arm/fft_init_arm.c
libavcodec/arm/fmtconvert_init_arm.c
libavcodec/arm/h264dsp_init_arm.c
libavcodec/arm/h264pred_init_arm.c
libavcodec/arm/mpegvideo_arm.c
libavcodec/arm/vp56dsp_init_arm.c
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/avcodec.h
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dv.c
libavcodec/dvdec.c
libavcodec/error_resilience.c
libavcodec/flvdec.c
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/intrax8.c
libavcodec/libopenjpegdec.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/msmpeg4.c
libavcodec/mxpegdec.c
libavcodec/options_table.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/rv10.c
libavcodec/sp5xdec.c
libavcodec/utils.c
libavcodec/x86/dsputil_mmx.c
libavformat/mov.c
libavutil/cpu.c
libavutil/cpu.h

diff --cc cmdutils.c
@@@ -498,98 -426,6 +498,106 @@@ int opt_loglevel(const char *opt, cons
      return 0;
  }
  
 +int opt_report(const char *opt)
 +{
 +    char filename[64];
 +    time_t now;
 +    struct tm *tm;
 +
 +    if (report_file) /* already opened */
 +        return 0;
 +    time(&now);
 +    tm = localtime(&now);
 +    snprintf(filename, sizeof(filename), "%s-%04d%02d%02d-%02d%02d%02d.log",
 +             program_name,
 +             tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
 +             tm->tm_hour, tm->tm_min, tm->tm_sec);
 +    report_file = fopen(filename, "w");
 +    if (!report_file) {
 +        av_log(NULL, AV_LOG_ERROR, "Failed to open report \"%s\": %s\n",
 +               filename, strerror(errno));
 +        return AVERROR(errno);
 +    }
 +    av_log_set_callback(log_callback_report);
 +    av_log(NULL, AV_LOG_INFO,
 +           "%s started on %04d-%02d-%02d at %02d:%02d:%02d\n"
 +           "Report written to \"%s\"\n",
 +           program_name,
 +           tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
 +           tm->tm_hour, tm->tm_min, tm->tm_sec,
 +           filename);
 +    av_log_set_level(FFMAX(av_log_get_level(), AV_LOG_VERBOSE));
 +    return 0;
 +}
 +
 +int opt_max_alloc(const char *opt, const char *arg)
 +{
 +    char *tail;
 +    size_t max;
 +
 +    max = strtol(arg, &tail, 10);
 +    if (*tail) {
 +        av_log(NULL, AV_LOG_FATAL, "Invalid max_alloc \"%s\".\n", arg);
 +        exit_program(1);
 +    }
 +    av_max_alloc(max);
 +    return 0;
 +}
 +
 +int opt_cpuflags(const char *opt, const char *arg)
 +{
 +    static const AVOption cpuflags_opts[] = {
 +        { "flags"   , NULL, 0, AV_OPT_TYPE_FLAGS, { 0 }, INT64_MIN, INT64_MAX, .unit = "flags" },
 +        { "altivec" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ALTIVEC  },    .unit = "flags" },
 +        { "mmx"     , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_MMX      },    .unit = "flags" },
 +        { "mmx2"    , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_MMX2     },    .unit = "flags" },
 +        { "sse"     , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE      },    .unit = "flags" },
 +        { "sse2"    , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE2     },    .unit = "flags" },
 +        { "sse2slow", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE2SLOW },    .unit = "flags" },
 +        { "sse3"    , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE3     },    .unit = "flags" },
 +        { "sse3slow", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE3SLOW },    .unit = "flags" },
 +        { "ssse3"   , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSSE3    },    .unit = "flags" },
 +        { "atom"    , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ATOM     },    .unit = "flags" },
 +        { "sse4.1"  , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE4     },    .unit = "flags" },
 +        { "sse4.2"  , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE42    },    .unit = "flags" },
 +        { "avx"     , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_AVX      },    .unit = "flags" },
 +        { "xop"     , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_XOP      },    .unit = "flags" },
 +        { "fma4"    , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_FMA4     },    .unit = "flags" },
 +        { "3dnow"   , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_3DNOW    },    .unit = "flags" },
 +        { "3dnowext", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_3DNOWEXT },    .unit = "flags" },
++
++        { "armv5te",  NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV5TE  },    .unit = "flags" },
++        { "armv6",    NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV6    },    .unit = "flags" },
++        { "armv6t2",  NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV6T2  },    .unit = "flags" },
++        { "vfp",      NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_VFP      },    .unit = "flags" },
++        { "vfpv3",    NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_VFPV3    },    .unit = "flags" },
++        { "neon",     NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_NEON     },    .unit = "flags" },
++
 +        { NULL },
 +    };
 +    static const AVClass class = {
 +        .class_name = "cpuflags",
 +        .item_name  = av_default_item_name,
 +        .option     = cpuflags_opts,
 +        .version    = LIBAVUTIL_VERSION_INT,
 +    };
 +    int flags = av_get_cpu_flags();
 +    int ret;
 +    const AVClass *pclass = &class;
 +
 +    if ((ret = av_opt_eval_flags(&pclass, &cpuflags_opts[0], arg, &flags)) < 0)
 +        return ret;
 +
 +    av_force_cpu_flags(flags);
 +    return 0;
 +}
 +
 +int opt_codec_debug(const char *opt, const char *arg)
 +{
 +    av_log_set_level(AV_LOG_DEBUG);
 +    return opt_default(opt, arg);
 +}
 +
  int opt_timelimit(const char *opt, const char *arg)
  {
  #if HAVE_SETRLIMIT
diff --cc ffplay.c
index 4489b34,0000000..8ee9b0d
mode 100644,000000..100644
--- /dev/null
+++ b/ffplay.c
@@@ -1,3251 -1,0 +1,3249 @@@
- static int lowres = 0;
 +/*
 + * Copyright (c) 2003 Fabrice Bellard
 + *
 + * 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
 + * simple media player based on the FFmpeg libraries
 + */
 +
 +#include "config.h"
 +#include <inttypes.h>
 +#include <math.h>
 +#include <limits.h>
 +#include <signal.h>
 +#include "libavutil/avstring.h"
 +#include "libavutil/colorspace.h"
 +#include "libavutil/mathematics.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavutil/imgutils.h"
 +#include "libavutil/dict.h"
 +#include "libavutil/parseutils.h"
 +#include "libavutil/samplefmt.h"
 +#include "libavutil/avassert.h"
 +#include "libavformat/avformat.h"
 +#include "libavdevice/avdevice.h"
 +#include "libswscale/swscale.h"
 +#include "libavcodec/audioconvert.h"
 +#include "libavutil/opt.h"
 +#include "libavcodec/avfft.h"
 +#include "libswresample/swresample.h"
 +
 +#if CONFIG_AVFILTER
 +# include "libavfilter/avcodec.h"
 +# include "libavfilter/avfilter.h"
 +# include "libavfilter/avfiltergraph.h"
 +# include "libavfilter/buffersink.h"
 +#endif
 +
 +#include <SDL.h>
 +#include <SDL_thread.h>
 +
 +#include "cmdutils.h"
 +
 +#include <unistd.h>
 +#include <assert.h>
 +
 +const char program_name[] = "ffplay";
 +const int program_birth_year = 2003;
 +
 +#define MAX_QUEUE_SIZE (15 * 1024 * 1024)
 +#define MIN_FRAMES 5
 +
 +/* SDL audio buffer size, in samples. Should be small to have precise
 +   A/V sync as SDL does not have hardware buffer fullness info. */
 +#define SDL_AUDIO_BUFFER_SIZE 1024
 +
 +/* no AV sync correction is done if below the AV sync threshold */
 +#define AV_SYNC_THRESHOLD 0.01
 +/* no AV correction is done if too big error */
 +#define AV_NOSYNC_THRESHOLD 10.0
 +
 +/* maximum audio speed change to get correct sync */
 +#define SAMPLE_CORRECTION_PERCENT_MAX 10
 +
 +/* we use about AUDIO_DIFF_AVG_NB A-V differences to make the average */
 +#define AUDIO_DIFF_AVG_NB   20
 +
 +/* NOTE: the size must be big enough to compensate the hardware audio buffersize size */
 +#define SAMPLE_ARRAY_SIZE (2 * 65536)
 +
 +static int sws_flags = SWS_BICUBIC;
 +
 +typedef struct PacketQueue {
 +    AVPacketList *first_pkt, *last_pkt;
 +    int nb_packets;
 +    int size;
 +    int abort_request;
 +    SDL_mutex *mutex;
 +    SDL_cond *cond;
 +} PacketQueue;
 +
 +#define VIDEO_PICTURE_QUEUE_SIZE 2
 +#define SUBPICTURE_QUEUE_SIZE 4
 +
 +typedef struct VideoPicture {
 +    double pts;                                  ///< presentation time stamp for this picture
 +    double duration;                             ///< expected duration of the frame
 +    int64_t pos;                                 ///< byte position in file
 +    int skip;
 +    SDL_Overlay *bmp;
 +    int width, height; /* source height & width */
 +    int allocated;
 +    int reallocate;
 +    enum PixelFormat pix_fmt;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterBufferRef *picref;
 +#endif
 +} VideoPicture;
 +
 +typedef struct SubPicture {
 +    double pts; /* presentation time stamp for this picture */
 +    AVSubtitle sub;
 +} SubPicture;
 +
 +enum {
 +    AV_SYNC_AUDIO_MASTER, /* default choice */
 +    AV_SYNC_VIDEO_MASTER,
 +    AV_SYNC_EXTERNAL_CLOCK, /* synchronize to an external clock */
 +};
 +
 +typedef struct VideoState {
 +    SDL_Thread *read_tid;
 +    SDL_Thread *video_tid;
 +    SDL_Thread *refresh_tid;
 +    AVInputFormat *iformat;
 +    int no_background;
 +    int abort_request;
 +    int force_refresh;
 +    int paused;
 +    int last_paused;
 +    int seek_req;
 +    int seek_flags;
 +    int64_t seek_pos;
 +    int64_t seek_rel;
 +    int read_pause_return;
 +    AVFormatContext *ic;
 +
 +    int audio_stream;
 +
 +    int av_sync_type;
 +    double external_clock; /* external clock base */
 +    int64_t external_clock_time;
 +
 +    double audio_clock;
 +    double audio_diff_cum; /* used for AV difference average computation */
 +    double audio_diff_avg_coef;
 +    double audio_diff_threshold;
 +    int audio_diff_avg_count;
 +    AVStream *audio_st;
 +    PacketQueue audioq;
 +    int audio_hw_buf_size;
 +    DECLARE_ALIGNED(16,uint8_t,audio_buf2)[AVCODEC_MAX_AUDIO_FRAME_SIZE * 4];
 +    uint8_t silence_buf[SDL_AUDIO_BUFFER_SIZE];
 +    uint8_t *audio_buf;
 +    uint8_t *audio_buf1;
 +    unsigned int audio_buf_size; /* in bytes */
 +    int audio_buf_index; /* in bytes */
 +    int audio_write_buf_size;
 +    AVPacket audio_pkt_temp;
 +    AVPacket audio_pkt;
 +    enum AVSampleFormat audio_src_fmt;
 +    enum AVSampleFormat audio_tgt_fmt;
 +    int audio_src_channels;
 +    int audio_tgt_channels;
 +    int64_t audio_src_channel_layout;
 +    int64_t audio_tgt_channel_layout;
 +    int audio_src_freq;
 +    int audio_tgt_freq;
 +    struct SwrContext *swr_ctx;
 +    double audio_current_pts;
 +    double audio_current_pts_drift;
 +    int frame_drops_early;
 +    int frame_drops_late;
 +    AVFrame *frame;
 +
 +    enum ShowMode {
 +        SHOW_MODE_NONE = -1, SHOW_MODE_VIDEO = 0, SHOW_MODE_WAVES, SHOW_MODE_RDFT, SHOW_MODE_NB
 +    } show_mode;
 +    int16_t sample_array[SAMPLE_ARRAY_SIZE];
 +    int sample_array_index;
 +    int last_i_start;
 +    RDFTContext *rdft;
 +    int rdft_bits;
 +    FFTSample *rdft_data;
 +    int xpos;
 +
 +    SDL_Thread *subtitle_tid;
 +    int subtitle_stream;
 +    int subtitle_stream_changed;
 +    AVStream *subtitle_st;
 +    PacketQueue subtitleq;
 +    SubPicture subpq[SUBPICTURE_QUEUE_SIZE];
 +    int subpq_size, subpq_rindex, subpq_windex;
 +    SDL_mutex *subpq_mutex;
 +    SDL_cond *subpq_cond;
 +
 +    double frame_timer;
 +    double frame_last_pts;
 +    double frame_last_duration;
 +    double frame_last_dropped_pts;
 +    double frame_last_returned_time;
 +    double frame_last_filter_delay;
 +    int64_t frame_last_dropped_pos;
 +    double video_clock;                          ///< pts of last decoded frame / predicted pts of next decoded frame
 +    int video_stream;
 +    AVStream *video_st;
 +    PacketQueue videoq;
 +    double video_current_pts;                    ///< current displayed pts (different from video_clock if frame fifos are used)
 +    double video_current_pts_drift;              ///< video_current_pts - time (av_gettime) at which we updated video_current_pts - used to have running video pts
 +    int64_t video_current_pos;                   ///< current displayed file pos
 +    VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE];
 +    int pictq_size, pictq_rindex, pictq_windex;
 +    SDL_mutex *pictq_mutex;
 +    SDL_cond *pictq_cond;
 +#if !CONFIG_AVFILTER
 +    struct SwsContext *img_convert_ctx;
 +#endif
 +
 +    char filename[1024];
 +    int width, height, xleft, ytop;
 +    int step;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterContext *out_video_filter;          ///< the last filter in the video chain
 +#endif
 +
 +    int refresh;
 +} VideoState;
 +
 +static int opt_help(const char *opt, const char *arg);
 +
 +/* options specified by the user */
 +static AVInputFormat *file_iformat;
 +static const char *input_filename;
 +static const char *window_title;
 +static int fs_screen_width;
 +static int fs_screen_height;
 +static int screen_width  = 0;
 +static int screen_height = 0;
 +static int audio_disable;
 +static int video_disable;
 +static int wanted_stream[AVMEDIA_TYPE_NB] = {
 +    [AVMEDIA_TYPE_AUDIO]    = -1,
 +    [AVMEDIA_TYPE_VIDEO]    = -1,
 +    [AVMEDIA_TYPE_SUBTITLE] = -1,
 +};
 +static int seek_by_bytes = -1;
 +static int display_disable;
 +static int show_status = 1;
 +static int av_sync_type = AV_SYNC_AUDIO_MASTER;
 +static int64_t start_time = AV_NOPTS_VALUE;
 +static int64_t duration = AV_NOPTS_VALUE;
 +static int workaround_bugs = 1;
 +static int fast = 0;
 +static int genpts = 0;
-                         "size of %dx%d pixels. Try using -lowres or -vf \"scale=w:h\"\n"
 +static int idct = FF_IDCT_AUTO;
 +static enum AVDiscard skip_frame       = AVDISCARD_DEFAULT;
 +static enum AVDiscard skip_idct        = AVDISCARD_DEFAULT;
 +static enum AVDiscard skip_loop_filter = AVDISCARD_DEFAULT;
 +static int error_concealment = 3;
 +static int decoder_reorder_pts = -1;
 +static int autoexit;
 +static int exit_on_keydown;
 +static int exit_on_mousedown;
 +static int loop = 1;
 +static int framedrop = -1;
 +static enum ShowMode show_mode = SHOW_MODE_NONE;
 +static const char *audio_codec_name;
 +static const char *subtitle_codec_name;
 +static const char *video_codec_name;
 +static int rdftspeed = 20;
 +#if CONFIG_AVFILTER
 +static char *vfilters = NULL;
 +#endif
 +
 +/* current context */
 +static int is_full_screen;
 +static int64_t audio_callback_time;
 +
 +static AVPacket flush_pkt;
 +
 +#define FF_ALLOC_EVENT   (SDL_USEREVENT)
 +#define FF_REFRESH_EVENT (SDL_USEREVENT + 1)
 +#define FF_QUIT_EVENT    (SDL_USEREVENT + 2)
 +
 +static SDL_Surface *screen;
 +
 +void av_noreturn exit_program(int ret)
 +{
 +    exit(ret);
 +}
 +
 +static int packet_queue_put(PacketQueue *q, AVPacket *pkt)
 +{
 +    AVPacketList *pkt1;
 +
 +    /* duplicate the packet */
 +    if (pkt != &flush_pkt && av_dup_packet(pkt) < 0)
 +        return -1;
 +
 +    pkt1 = av_malloc(sizeof(AVPacketList));
 +    if (!pkt1)
 +        return -1;
 +    pkt1->pkt = *pkt;
 +    pkt1->next = NULL;
 +
 +
 +    SDL_LockMutex(q->mutex);
 +
 +    if (!q->last_pkt)
 +
 +        q->first_pkt = pkt1;
 +    else
 +        q->last_pkt->next = pkt1;
 +    q->last_pkt = pkt1;
 +    q->nb_packets++;
 +    q->size += pkt1->pkt.size + sizeof(*pkt1);
 +    /* XXX: should duplicate packet data in DV case */
 +    SDL_CondSignal(q->cond);
 +
 +    SDL_UnlockMutex(q->mutex);
 +    return 0;
 +}
 +
 +/* packet queue handling */
 +static void packet_queue_init(PacketQueue *q)
 +{
 +    memset(q, 0, sizeof(PacketQueue));
 +    q->mutex = SDL_CreateMutex();
 +    q->cond = SDL_CreateCond();
 +    packet_queue_put(q, &flush_pkt);
 +}
 +
 +static void packet_queue_flush(PacketQueue *q)
 +{
 +    AVPacketList *pkt, *pkt1;
 +
 +    SDL_LockMutex(q->mutex);
 +    for (pkt = q->first_pkt; pkt != NULL; pkt = pkt1) {
 +        pkt1 = pkt->next;
 +        av_free_packet(&pkt->pkt);
 +        av_freep(&pkt);
 +    }
 +    q->last_pkt = NULL;
 +    q->first_pkt = NULL;
 +    q->nb_packets = 0;
 +    q->size = 0;
 +    SDL_UnlockMutex(q->mutex);
 +}
 +
 +static void packet_queue_end(PacketQueue *q)
 +{
 +    packet_queue_flush(q);
 +    SDL_DestroyMutex(q->mutex);
 +    SDL_DestroyCond(q->cond);
 +}
 +
 +static void packet_queue_abort(PacketQueue *q)
 +{
 +    SDL_LockMutex(q->mutex);
 +
 +    q->abort_request = 1;
 +
 +    SDL_CondSignal(q->cond);
 +
 +    SDL_UnlockMutex(q->mutex);
 +}
 +
 +/* return < 0 if aborted, 0 if no packet and > 0 if packet.  */
 +static int packet_queue_get(PacketQueue *q, AVPacket *pkt, int block)
 +{
 +    AVPacketList *pkt1;
 +    int ret;
 +
 +    SDL_LockMutex(q->mutex);
 +
 +    for (;;) {
 +        if (q->abort_request) {
 +            ret = -1;
 +            break;
 +        }
 +
 +        pkt1 = q->first_pkt;
 +        if (pkt1) {
 +            q->first_pkt = pkt1->next;
 +            if (!q->first_pkt)
 +                q->last_pkt = NULL;
 +            q->nb_packets--;
 +            q->size -= pkt1->pkt.size + sizeof(*pkt1);
 +            *pkt = pkt1->pkt;
 +            av_free(pkt1);
 +            ret = 1;
 +            break;
 +        } else if (!block) {
 +            ret = 0;
 +            break;
 +        } else {
 +            SDL_CondWait(q->cond, q->mutex);
 +        }
 +    }
 +    SDL_UnlockMutex(q->mutex);
 +    return ret;
 +}
 +
 +static inline void fill_rectangle(SDL_Surface *screen,
 +                                  int x, int y, int w, int h, int color)
 +{
 +    SDL_Rect rect;
 +    rect.x = x;
 +    rect.y = y;
 +    rect.w = w;
 +    rect.h = h;
 +    SDL_FillRect(screen, &rect, color);
 +}
 +
 +#define ALPHA_BLEND(a, oldp, newp, s)\
 +((((oldp << s) * (255 - (a))) + (newp * (a))) / (255 << s))
 +
 +#define RGBA_IN(r, g, b, a, s)\
 +{\
 +    unsigned int v = ((const uint32_t *)(s))[0];\
 +    a = (v >> 24) & 0xff;\
 +    r = (v >> 16) & 0xff;\
 +    g = (v >> 8) & 0xff;\
 +    b = v & 0xff;\
 +}
 +
 +#define YUVA_IN(y, u, v, a, s, pal)\
 +{\
 +    unsigned int val = ((const uint32_t *)(pal))[*(const uint8_t*)(s)];\
 +    a = (val >> 24) & 0xff;\
 +    y = (val >> 16) & 0xff;\
 +    u = (val >> 8) & 0xff;\
 +    v = val & 0xff;\
 +}
 +
 +#define YUVA_OUT(d, y, u, v, a)\
 +{\
 +    ((uint32_t *)(d))[0] = (a << 24) | (y << 16) | (u << 8) | v;\
 +}
 +
 +
 +#define BPP 1
 +
 +static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw, int imgh)
 +{
 +    int wrap, wrap3, width2, skip2;
 +    int y, u, v, a, u1, v1, a1, w, h;
 +    uint8_t *lum, *cb, *cr;
 +    const uint8_t *p;
 +    const uint32_t *pal;
 +    int dstx, dsty, dstw, dsth;
 +
 +    dstw = av_clip(rect->w, 0, imgw);
 +    dsth = av_clip(rect->h, 0, imgh);
 +    dstx = av_clip(rect->x, 0, imgw - dstw);
 +    dsty = av_clip(rect->y, 0, imgh - dsth);
 +    lum = dst->data[0] + dsty * dst->linesize[0];
 +    cb  = dst->data[1] + (dsty >> 1) * dst->linesize[1];
 +    cr  = dst->data[2] + (dsty >> 1) * dst->linesize[2];
 +
 +    width2 = ((dstw + 1) >> 1) + (dstx & ~dstw & 1);
 +    skip2 = dstx >> 1;
 +    wrap = dst->linesize[0];
 +    wrap3 = rect->pict.linesize[0];
 +    p = rect->pict.data[0];
 +    pal = (const uint32_t *)rect->pict.data[1];  /* Now in YCrCb! */
 +
 +    if (dsty & 1) {
 +        lum += dstx;
 +        cb += skip2;
 +        cr += skip2;
 +
 +        if (dstx & 1) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +            cb++;
 +            cr++;
 +            lum++;
 +            p += BPP;
 +        }
 +        for (w = dstw - (dstx & 1); w >= 2; w -= 2) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 1);
 +            cb++;
 +            cr++;
 +            p += 2 * BPP;
 +            lum += 2;
 +        }
 +        if (w) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +            p++;
 +            lum++;
 +        }
 +        p += wrap3 - dstw * BPP;
 +        lum += wrap - dstw - dstx;
 +        cb += dst->linesize[1] - width2 - skip2;
 +        cr += dst->linesize[2] - width2 - skip2;
 +    }
 +    for (h = dsth - (dsty & 1); h >= 2; h -= 2) {
 +        lum += dstx;
 +        cb += skip2;
 +        cr += skip2;
 +
 +        if (dstx & 1) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            p += wrap3;
 +            lum += wrap;
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 1);
 +            cb++;
 +            cr++;
 +            p += -wrap3 + BPP;
 +            lum += -wrap + 1;
 +        }
 +        for (w = dstw - (dstx & 1); w >= 2; w -= 2) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +            p += wrap3;
 +            lum += wrap;
 +
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 2);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 2);
 +
 +            cb++;
 +            cr++;
 +            p += -wrap3 + 2 * BPP;
 +            lum += -wrap + 2;
 +        }
 +        if (w) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            p += wrap3;
 +            lum += wrap;
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u1, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v1, 1);
 +            cb++;
 +            cr++;
 +            p += -wrap3 + BPP;
 +            lum += -wrap + 1;
 +        }
 +        p += wrap3 + (wrap3 - dstw * BPP);
 +        lum += wrap + (wrap - dstw - dstx);
 +        cb += dst->linesize[1] - width2 - skip2;
 +        cr += dst->linesize[2] - width2 - skip2;
 +    }
 +    /* handle odd height */
 +    if (h) {
 +        lum += dstx;
 +        cb += skip2;
 +        cr += skip2;
 +
 +        if (dstx & 1) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +            cb++;
 +            cr++;
 +            lum++;
 +            p += BPP;
 +        }
 +        for (w = dstw - (dstx & 1); w >= 2; w -= 2) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            u1 = u;
 +            v1 = v;
 +            a1 = a;
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +
 +            YUVA_IN(y, u, v, a, p + BPP, pal);
 +            u1 += u;
 +            v1 += v;
 +            a1 += a;
 +            lum[1] = ALPHA_BLEND(a, lum[1], y, 0);
 +            cb[0] = ALPHA_BLEND(a1 >> 2, cb[0], u, 1);
 +            cr[0] = ALPHA_BLEND(a1 >> 2, cr[0], v, 1);
 +            cb++;
 +            cr++;
 +            p += 2 * BPP;
 +            lum += 2;
 +        }
 +        if (w) {
 +            YUVA_IN(y, u, v, a, p, pal);
 +            lum[0] = ALPHA_BLEND(a, lum[0], y, 0);
 +            cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0);
 +            cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0);
 +        }
 +    }
 +}
 +
 +static void free_subpicture(SubPicture *sp)
 +{
 +    avsubtitle_free(&sp->sub);
 +}
 +
 +static void video_image_display(VideoState *is)
 +{
 +    VideoPicture *vp;
 +    SubPicture *sp;
 +    AVPicture pict;
 +    float aspect_ratio;
 +    int width, height, x, y;
 +    SDL_Rect rect;
 +    int i;
 +
 +    vp = &is->pictq[is->pictq_rindex];
 +    if (vp->bmp) {
 +#if CONFIG_AVFILTER
 +         if (vp->picref->video->sample_aspect_ratio.num == 0)
 +             aspect_ratio = 0;
 +         else
 +             aspect_ratio = av_q2d(vp->picref->video->sample_aspect_ratio);
 +#else
 +
 +        /* XXX: use variable in the frame */
 +        if (is->video_st->sample_aspect_ratio.num)
 +            aspect_ratio = av_q2d(is->video_st->sample_aspect_ratio);
 +        else if (is->video_st->codec->sample_aspect_ratio.num)
 +            aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio);
 +        else
 +            aspect_ratio = 0;
 +#endif
 +        if (aspect_ratio <= 0.0)
 +            aspect_ratio = 1.0;
 +        aspect_ratio *= (float)vp->width / (float)vp->height;
 +
 +        if (is->subtitle_st) {
 +            if (is->subpq_size > 0) {
 +                sp = &is->subpq[is->subpq_rindex];
 +
 +                if (vp->pts >= sp->pts + ((float) sp->sub.start_display_time / 1000)) {
 +                    SDL_LockYUVOverlay (vp->bmp);
 +
 +                    pict.data[0] = vp->bmp->pixels[0];
 +                    pict.data[1] = vp->bmp->pixels[2];
 +                    pict.data[2] = vp->bmp->pixels[1];
 +
 +                    pict.linesize[0] = vp->bmp->pitches[0];
 +                    pict.linesize[1] = vp->bmp->pitches[2];
 +                    pict.linesize[2] = vp->bmp->pitches[1];
 +
 +                    for (i = 0; i < sp->sub.num_rects; i++)
 +                        blend_subrect(&pict, sp->sub.rects[i],
 +                                      vp->bmp->w, vp->bmp->h);
 +
 +                    SDL_UnlockYUVOverlay (vp->bmp);
 +                }
 +            }
 +        }
 +
 +
 +        /* XXX: we suppose the screen has a 1.0 pixel ratio */
 +        height = is->height;
 +        width = ((int)rint(height * aspect_ratio)) & ~1;
 +        if (width > is->width) {
 +            width = is->width;
 +            height = ((int)rint(width / aspect_ratio)) & ~1;
 +        }
 +        x = (is->width - width) / 2;
 +        y = (is->height - height) / 2;
 +        is->no_background = 0;
 +        rect.x = is->xleft + x;
 +        rect.y = is->ytop  + y;
 +        rect.w = FFMAX(width,  1);
 +        rect.h = FFMAX(height, 1);
 +        SDL_DisplayYUVOverlay(vp->bmp, &rect);
 +    }
 +}
 +
 +static inline int compute_mod(int a, int b)
 +{
 +    return a < 0 ? a%b + b : a%b;
 +}
 +
 +static void video_audio_display(VideoState *s)
 +{
 +    int i, i_start, x, y1, y, ys, delay, n, nb_display_channels;
 +    int ch, channels, h, h2, bgcolor, fgcolor;
 +    int16_t time_diff;
 +    int rdft_bits, nb_freq;
 +
 +    for (rdft_bits = 1; (1 << rdft_bits) < 2 * s->height; rdft_bits++)
 +        ;
 +    nb_freq = 1 << (rdft_bits - 1);
 +
 +    /* compute display index : center on currently output samples */
 +    channels = s->audio_tgt_channels;
 +    nb_display_channels = channels;
 +    if (!s->paused) {
 +        int data_used= s->show_mode == SHOW_MODE_WAVES ? s->width : (2*nb_freq);
 +        n = 2 * channels;
 +        delay = s->audio_write_buf_size;
 +        delay /= n;
 +
 +        /* to be more precise, we take into account the time spent since
 +           the last buffer computation */
 +        if (audio_callback_time) {
 +            time_diff = av_gettime() - audio_callback_time;
 +            delay -= (time_diff * s->audio_tgt_freq) / 1000000;
 +        }
 +
 +        delay += 2 * data_used;
 +        if (delay < data_used)
 +            delay = data_used;
 +
 +        i_start= x = compute_mod(s->sample_array_index - delay * channels, SAMPLE_ARRAY_SIZE);
 +        if (s->show_mode == SHOW_MODE_WAVES) {
 +            h = INT_MIN;
 +            for (i = 0; i < 1000; i += channels) {
 +                int idx = (SAMPLE_ARRAY_SIZE + x - i) % SAMPLE_ARRAY_SIZE;
 +                int a = s->sample_array[idx];
 +                int b = s->sample_array[(idx + 4 * channels) % SAMPLE_ARRAY_SIZE];
 +                int c = s->sample_array[(idx + 5 * channels) % SAMPLE_ARRAY_SIZE];
 +                int d = s->sample_array[(idx + 9 * channels) % SAMPLE_ARRAY_SIZE];
 +                int score = a - d;
 +                if (h < score && (b ^ c) < 0) {
 +                    h = score;
 +                    i_start = idx;
 +                }
 +            }
 +        }
 +
 +        s->last_i_start = i_start;
 +    } else {
 +        i_start = s->last_i_start;
 +    }
 +
 +    bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
 +    if (s->show_mode == SHOW_MODE_WAVES) {
 +        fill_rectangle(screen,
 +                       s->xleft, s->ytop, s->width, s->height,
 +                       bgcolor);
 +
 +        fgcolor = SDL_MapRGB(screen->format, 0xff, 0xff, 0xff);
 +
 +        /* total height for one channel */
 +        h = s->height / nb_display_channels;
 +        /* graph height / 2 */
 +        h2 = (h * 9) / 20;
 +        for (ch = 0; ch < nb_display_channels; ch++) {
 +            i = i_start + ch;
 +            y1 = s->ytop + ch * h + (h / 2); /* position of center line */
 +            for (x = 0; x < s->width; x++) {
 +                y = (s->sample_array[i] * h2) >> 15;
 +                if (y < 0) {
 +                    y = -y;
 +                    ys = y1 - y;
 +                } else {
 +                    ys = y1;
 +                }
 +                fill_rectangle(screen,
 +                               s->xleft + x, ys, 1, y,
 +                               fgcolor);
 +                i += channels;
 +                if (i >= SAMPLE_ARRAY_SIZE)
 +                    i -= SAMPLE_ARRAY_SIZE;
 +            }
 +        }
 +
 +        fgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0xff);
 +
 +        for (ch = 1; ch < nb_display_channels; ch++) {
 +            y = s->ytop + ch * h;
 +            fill_rectangle(screen,
 +                           s->xleft, y, s->width, 1,
 +                           fgcolor);
 +        }
 +        SDL_UpdateRect(screen, s->xleft, s->ytop, s->width, s->height);
 +    } else {
 +        nb_display_channels= FFMIN(nb_display_channels, 2);
 +        if (rdft_bits != s->rdft_bits) {
 +            av_rdft_end(s->rdft);
 +            av_free(s->rdft_data);
 +            s->rdft = av_rdft_init(rdft_bits, DFT_R2C);
 +            s->rdft_bits = rdft_bits;
 +            s->rdft_data = av_malloc(4 * nb_freq * sizeof(*s->rdft_data));
 +        }
 +        {
 +            FFTSample *data[2];
 +            for (ch = 0; ch < nb_display_channels; ch++) {
 +                data[ch] = s->rdft_data + 2 * nb_freq * ch;
 +                i = i_start + ch;
 +                for (x = 0; x < 2 * nb_freq; x++) {
 +                    double w = (x-nb_freq) * (1.0 / nb_freq);
 +                    data[ch][x] = s->sample_array[i] * (1.0 - w * w);
 +                    i += channels;
 +                    if (i >= SAMPLE_ARRAY_SIZE)
 +                        i -= SAMPLE_ARRAY_SIZE;
 +                }
 +                av_rdft_calc(s->rdft, data[ch]);
 +            }
 +            // least efficient way to do this, we should of course directly access it but its more than fast enough
 +            for (y = 0; y < s->height; y++) {
 +                double w = 1 / sqrt(nb_freq);
 +                int a = sqrt(w * sqrt(data[0][2 * y + 0] * data[0][2 * y + 0] + data[0][2 * y + 1] * data[0][2 * y + 1]));
 +                int b = (nb_display_channels == 2 ) ? sqrt(w * sqrt(data[1][2 * y + 0] * data[1][2 * y + 0]
 +                       + data[1][2 * y + 1] * data[1][2 * y + 1])) : a;
 +                a = FFMIN(a, 255);
 +                b = FFMIN(b, 255);
 +                fgcolor = SDL_MapRGB(screen->format, a, b, (a + b) / 2);
 +
 +                fill_rectangle(screen,
 +                            s->xpos, s->height-y, 1, 1,
 +                            fgcolor);
 +            }
 +        }
 +        SDL_UpdateRect(screen, s->xpos, s->ytop, 1, s->height);
 +        if (!s->paused)
 +            s->xpos++;
 +        if (s->xpos >= s->width)
 +            s->xpos= s->xleft;
 +    }
 +}
 +
 +static void stream_close(VideoState *is)
 +{
 +    VideoPicture *vp;
 +    int i;
 +    /* XXX: use a special url_shutdown call to abort parse cleanly */
 +    is->abort_request = 1;
 +    SDL_WaitThread(is->read_tid, NULL);
 +    SDL_WaitThread(is->refresh_tid, NULL);
 +
 +    /* free all pictures */
 +    for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +        vp = &is->pictq[i];
 +#if CONFIG_AVFILTER
 +        if (vp->picref) {
 +            avfilter_unref_buffer(vp->picref);
 +            vp->picref = NULL;
 +        }
 +#endif
 +        if (vp->bmp) {
 +            SDL_FreeYUVOverlay(vp->bmp);
 +            vp->bmp = NULL;
 +        }
 +    }
 +    SDL_DestroyMutex(is->pictq_mutex);
 +    SDL_DestroyCond(is->pictq_cond);
 +    SDL_DestroyMutex(is->subpq_mutex);
 +    SDL_DestroyCond(is->subpq_cond);
 +#if !CONFIG_AVFILTER
 +    if (is->img_convert_ctx)
 +        sws_freeContext(is->img_convert_ctx);
 +#endif
 +    av_free(is);
 +}
 +
 +static void do_exit(VideoState *is)
 +{
 +    if (is) {
 +        stream_close(is);
 +    }
 +    av_lockmgr_register(NULL);
 +    uninit_opts();
 +#if CONFIG_AVFILTER
 +    avfilter_uninit();
 +#endif
 +    avformat_network_deinit();
 +    if (show_status)
 +        printf("\n");
 +    SDL_Quit();
 +    av_log(NULL, AV_LOG_QUIET, "%s", "");
 +    exit(0);
 +}
 +
 +static void sigterm_handler(int sig)
 +{
 +    exit(123);
 +}
 +
 +static int video_open(VideoState *is, int force_set_video_mode)
 +{
 +    int flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL;
 +    int w,h;
 +
 +    if (is_full_screen) flags |= SDL_FULLSCREEN;
 +    else                flags |= SDL_RESIZABLE;
 +
 +    if (is_full_screen && fs_screen_width) {
 +        w = fs_screen_width;
 +        h = fs_screen_height;
 +    } else if (!is_full_screen && screen_width) {
 +        w = screen_width;
 +        h = screen_height;
 +#if CONFIG_AVFILTER
 +    } else if (is->out_video_filter && is->out_video_filter->inputs[0]) {
 +        w = is->out_video_filter->inputs[0]->w;
 +        h = is->out_video_filter->inputs[0]->h;
 +#else
 +    } else if (is->video_st && is->video_st->codec->width) {
 +        w = is->video_st->codec->width;
 +        h = is->video_st->codec->height;
 +#endif
 +    } else {
 +        w = 640;
 +        h = 480;
 +    }
 +    if (screen && is->width == screen->w && screen->w == w
 +       && is->height== screen->h && screen->h == h && !force_set_video_mode)
 +        return 0;
 +    screen = SDL_SetVideoMode(w, h, 0, flags);
 +    if (!screen) {
 +        fprintf(stderr, "SDL: could not set video mode - exiting\n");
 +        do_exit(is);
 +    }
 +    if (!window_title)
 +        window_title = input_filename;
 +    SDL_WM_SetCaption(window_title, window_title);
 +
 +    is->width  = screen->w;
 +    is->height = screen->h;
 +
 +    return 0;
 +}
 +
 +/* display the current picture, if any */
 +static void video_display(VideoState *is)
 +{
 +    if (!screen)
 +        video_open(is, 0);
 +    if (is->audio_st && is->show_mode != SHOW_MODE_VIDEO)
 +        video_audio_display(is);
 +    else if (is->video_st)
 +        video_image_display(is);
 +}
 +
 +static int refresh_thread(void *opaque)
 +{
 +    VideoState *is= opaque;
 +    while (!is->abort_request) {
 +        SDL_Event event;
 +        event.type = FF_REFRESH_EVENT;
 +        event.user.data1 = opaque;
 +        if (!is->refresh && (!is->paused || is->force_refresh)) {
 +            is->refresh = 1;
 +            SDL_PushEvent(&event);
 +        }
 +        //FIXME ideally we should wait the correct time but SDLs event passing is so slow it would be silly
 +        usleep(is->audio_st && is->show_mode != SHOW_MODE_VIDEO ? rdftspeed*1000 : 5000);
 +    }
 +    return 0;
 +}
 +
 +/* get the current audio clock value */
 +static double get_audio_clock(VideoState *is)
 +{
 +    if (is->paused) {
 +        return is->audio_current_pts;
 +    } else {
 +        return is->audio_current_pts_drift + av_gettime() / 1000000.0;
 +    }
 +}
 +
 +/* get the current video clock value */
 +static double get_video_clock(VideoState *is)
 +{
 +    if (is->paused) {
 +        return is->video_current_pts;
 +    } else {
 +        return is->video_current_pts_drift + av_gettime() / 1000000.0;
 +    }
 +}
 +
 +/* get the current external clock value */
 +static double get_external_clock(VideoState *is)
 +{
 +    int64_t ti;
 +    ti = av_gettime();
 +    return is->external_clock + ((ti - is->external_clock_time) * 1e-6);
 +}
 +
 +/* get the current master clock value */
 +static double get_master_clock(VideoState *is)
 +{
 +    double val;
 +
 +    if (is->av_sync_type == AV_SYNC_VIDEO_MASTER) {
 +        if (is->video_st)
 +            val = get_video_clock(is);
 +        else
 +            val = get_audio_clock(is);
 +    } else if (is->av_sync_type == AV_SYNC_AUDIO_MASTER) {
 +        if (is->audio_st)
 +            val = get_audio_clock(is);
 +        else
 +            val = get_video_clock(is);
 +    } else {
 +        val = get_external_clock(is);
 +    }
 +    return val;
 +}
 +
 +/* seek in the stream */
 +static void stream_seek(VideoState *is, int64_t pos, int64_t rel, int seek_by_bytes)
 +{
 +    if (!is->seek_req) {
 +        is->seek_pos = pos;
 +        is->seek_rel = rel;
 +        is->seek_flags &= ~AVSEEK_FLAG_BYTE;
 +        if (seek_by_bytes)
 +            is->seek_flags |= AVSEEK_FLAG_BYTE;
 +        is->seek_req = 1;
 +    }
 +}
 +
 +/* pause or resume the video */
 +static void stream_toggle_pause(VideoState *is)
 +{
 +    if (is->paused) {
 +        is->frame_timer += av_gettime() / 1000000.0 + is->video_current_pts_drift - is->video_current_pts;
 +        if (is->read_pause_return != AVERROR(ENOSYS)) {
 +            is->video_current_pts = is->video_current_pts_drift + av_gettime() / 1000000.0;
 +        }
 +        is->video_current_pts_drift = is->video_current_pts - av_gettime() / 1000000.0;
 +    }
 +    is->paused = !is->paused;
 +}
 +
 +static double compute_target_delay(double delay, VideoState *is)
 +{
 +    double sync_threshold, diff;
 +
 +    /* update delay to follow master synchronisation source */
 +    if (((is->av_sync_type == AV_SYNC_AUDIO_MASTER && is->audio_st) ||
 +         is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK)) {
 +        /* if video is slave, we try to correct big delays by
 +           duplicating or deleting a frame */
 +        diff = get_video_clock(is) - get_master_clock(is);
 +
 +        /* skip or repeat frame. We take into account the
 +           delay to compute the threshold. I still don't know
 +           if it is the best guess */
 +        sync_threshold = FFMAX(AV_SYNC_THRESHOLD, delay);
 +        if (fabs(diff) < AV_NOSYNC_THRESHOLD) {
 +            if (diff <= -sync_threshold)
 +                delay = 0;
 +            else if (diff >= sync_threshold)
 +                delay = 2 * delay;
 +        }
 +    }
 +
 +    av_dlog(NULL, "video: delay=%0.3f A-V=%f\n",
 +            delay, -diff);
 +
 +    return delay;
 +}
 +
 +static void pictq_next_picture(VideoState *is) {
 +    /* update queue size and signal for next picture */
 +    if (++is->pictq_rindex == VIDEO_PICTURE_QUEUE_SIZE)
 +        is->pictq_rindex = 0;
 +
 +    SDL_LockMutex(is->pictq_mutex);
 +    is->pictq_size--;
 +    SDL_CondSignal(is->pictq_cond);
 +    SDL_UnlockMutex(is->pictq_mutex);
 +}
 +
 +static void update_video_pts(VideoState *is, double pts, int64_t pos) {
 +    double time = av_gettime() / 1000000.0;
 +    /* update current video pts */
 +    is->video_current_pts = pts;
 +    is->video_current_pts_drift = is->video_current_pts - time;
 +    is->video_current_pos = pos;
 +    is->frame_last_pts = pts;
 +}
 +
 +/* called to display each frame */
 +static void video_refresh(void *opaque)
 +{
 +    VideoState *is = opaque;
 +    VideoPicture *vp;
 +    double time;
 +
 +    SubPicture *sp, *sp2;
 +
 +    if (is->video_st) {
 +retry:
 +        if (is->pictq_size == 0) {
 +            SDL_LockMutex(is->pictq_mutex);
 +            if (is->frame_last_dropped_pts != AV_NOPTS_VALUE && is->frame_last_dropped_pts > is->frame_last_pts) {
 +                update_video_pts(is, is->frame_last_dropped_pts, is->frame_last_dropped_pos);
 +                is->frame_last_dropped_pts = AV_NOPTS_VALUE;
 +            }
 +            SDL_UnlockMutex(is->pictq_mutex);
 +            // nothing to do, no picture to display in the que
 +        } else {
 +            double last_duration, duration, delay;
 +            /* dequeue the picture */
 +            vp = &is->pictq[is->pictq_rindex];
 +
 +            if (vp->skip) {
 +                pictq_next_picture(is);
 +                goto retry;
 +            }
 +
 +            if (is->paused)
 +                goto display;
 +
 +            /* compute nominal last_duration */
 +            last_duration = vp->pts - is->frame_last_pts;
 +            if (last_duration > 0 && last_duration < 10.0) {
 +                /* if duration of the last frame was sane, update last_duration in video state */
 +                is->frame_last_duration = last_duration;
 +            }
 +            delay = compute_target_delay(is->frame_last_duration, is);
 +
 +            time= av_gettime()/1000000.0;
 +            if (time < is->frame_timer + delay)
 +                return;
 +
 +            if (delay > 0)
 +                is->frame_timer += delay * FFMAX(1, floor((time-is->frame_timer) / delay));
 +
 +            SDL_LockMutex(is->pictq_mutex);
 +            update_video_pts(is, vp->pts, vp->pos);
 +            SDL_UnlockMutex(is->pictq_mutex);
 +
 +            if (is->pictq_size > 1) {
 +                VideoPicture *nextvp = &is->pictq[(is->pictq_rindex + 1) % VIDEO_PICTURE_QUEUE_SIZE];
 +                duration = nextvp->pts - vp->pts; // More accurate this way, 1/time_base is often not reflecting FPS
 +            } else {
 +                duration = vp->duration;
 +            }
 +
 +            if((framedrop>0 || (framedrop && is->audio_st)) && time > is->frame_timer + duration){
 +                if(is->pictq_size > 1){
 +                    is->frame_drops_late++;
 +                    pictq_next_picture(is);
 +                    goto retry;
 +                }
 +            }
 +
 +            if (is->subtitle_st) {
 +                if (is->subtitle_stream_changed) {
 +                    SDL_LockMutex(is->subpq_mutex);
 +
 +                    while (is->subpq_size) {
 +                        free_subpicture(&is->subpq[is->subpq_rindex]);
 +
 +                        /* update queue size and signal for next picture */
 +                        if (++is->subpq_rindex == SUBPICTURE_QUEUE_SIZE)
 +                            is->subpq_rindex = 0;
 +
 +                        is->subpq_size--;
 +                    }
 +                    is->subtitle_stream_changed = 0;
 +
 +                    SDL_CondSignal(is->subpq_cond);
 +                    SDL_UnlockMutex(is->subpq_mutex);
 +                } else {
 +                    if (is->subpq_size > 0) {
 +                        sp = &is->subpq[is->subpq_rindex];
 +
 +                        if (is->subpq_size > 1)
 +                            sp2 = &is->subpq[(is->subpq_rindex + 1) % SUBPICTURE_QUEUE_SIZE];
 +                        else
 +                            sp2 = NULL;
 +
 +                        if ((is->video_current_pts > (sp->pts + ((float) sp->sub.end_display_time / 1000)))
 +                                || (sp2 && is->video_current_pts > (sp2->pts + ((float) sp2->sub.start_display_time / 1000))))
 +                        {
 +                            free_subpicture(sp);
 +
 +                            /* update queue size and signal for next picture */
 +                            if (++is->subpq_rindex == SUBPICTURE_QUEUE_SIZE)
 +                                is->subpq_rindex = 0;
 +
 +                            SDL_LockMutex(is->subpq_mutex);
 +                            is->subpq_size--;
 +                            SDL_CondSignal(is->subpq_cond);
 +                            SDL_UnlockMutex(is->subpq_mutex);
 +                        }
 +                    }
 +                }
 +            }
 +
 +display:
 +            /* display picture */
 +            if (!display_disable)
 +                video_display(is);
 +
 +            if (!is->paused)
 +                pictq_next_picture(is);
 +        }
 +    } else if (is->audio_st) {
 +        /* draw the next audio frame */
 +
 +        /* if only audio stream, then display the audio bars (better
 +           than nothing, just to test the implementation */
 +
 +        /* display picture */
 +        if (!display_disable)
 +            video_display(is);
 +    }
 +    is->force_refresh = 0;
 +    if (show_status) {
 +        static int64_t last_time;
 +        int64_t cur_time;
 +        int aqsize, vqsize, sqsize;
 +        double av_diff;
 +
 +        cur_time = av_gettime();
 +        if (!last_time || (cur_time - last_time) >= 30000) {
 +            aqsize = 0;
 +            vqsize = 0;
 +            sqsize = 0;
 +            if (is->audio_st)
 +                aqsize = is->audioq.size;
 +            if (is->video_st)
 +                vqsize = is->videoq.size;
 +            if (is->subtitle_st)
 +                sqsize = is->subtitleq.size;
 +            av_diff = 0;
 +            if (is->audio_st && is->video_st)
 +                av_diff = get_audio_clock(is) - get_video_clock(is);
 +            printf("%7.2f A-V:%7.3f fd=%4d aq=%5dKB vq=%5dKB sq=%5dB f=%"PRId64"/%"PRId64"   \r",
 +                   get_master_clock(is),
 +                   av_diff,
 +                   is->frame_drops_early + is->frame_drops_late,
 +                   aqsize / 1024,
 +                   vqsize / 1024,
 +                   sqsize,
 +                   is->video_st ? is->video_st->codec->pts_correction_num_faulty_dts : 0,
 +                   is->video_st ? is->video_st->codec->pts_correction_num_faulty_pts : 0);
 +            fflush(stdout);
 +            last_time = cur_time;
 +        }
 +    }
 +}
 +
 +/* allocate a picture (needs to do that in main thread to avoid
 +   potential locking problems */
 +static void alloc_picture(void *opaque)
 +{
 +    VideoState *is = opaque;
 +    VideoPicture *vp;
 +
 +    vp = &is->pictq[is->pictq_windex];
 +
 +    if (vp->bmp)
 +        SDL_FreeYUVOverlay(vp->bmp);
 +
 +#if CONFIG_AVFILTER
 +    if (vp->picref)
 +        avfilter_unref_buffer(vp->picref);
 +    vp->picref = NULL;
 +
 +    vp->width   = is->out_video_filter->inputs[0]->w;
 +    vp->height  = is->out_video_filter->inputs[0]->h;
 +    vp->pix_fmt = is->out_video_filter->inputs[0]->format;
 +#else
 +    vp->width   = is->video_st->codec->width;
 +    vp->height  = is->video_st->codec->height;
 +    vp->pix_fmt = is->video_st->codec->pix_fmt;
 +#endif
 +
 +    vp->bmp = SDL_CreateYUVOverlay(vp->width, vp->height,
 +                                   SDL_YV12_OVERLAY,
 +                                   screen);
 +    if (!vp->bmp || vp->bmp->pitches[0] < vp->width) {
 +        /* SDL allocates a buffer smaller than requested if the video
 +         * overlay hardware is unable to support the requested size. */
 +        fprintf(stderr, "Error: the video system does not support an image\n"
-     { "lowres", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&lowres }, "", "" },
++                        "size of %dx%d pixels. Try using -vf \"scale=w:h\"\n"
 +                        "to reduce the image size.\n", vp->width, vp->height );
 +        do_exit(is);
 +    }
 +
 +    SDL_LockMutex(is->pictq_mutex);
 +    vp->allocated = 1;
 +    SDL_CondSignal(is->pictq_cond);
 +    SDL_UnlockMutex(is->pictq_mutex);
 +}
 +
 +static int queue_picture(VideoState *is, AVFrame *src_frame, double pts1, int64_t pos)
 +{
 +    VideoPicture *vp;
 +    double frame_delay, pts = pts1;
 +
 +    /* compute the exact PTS for the picture if it is omitted in the stream
 +     * pts1 is the dts of the pkt / pts of the frame */
 +    if (pts != 0) {
 +        /* update video clock with pts, if present */
 +        is->video_clock = pts;
 +    } else {
 +        pts = is->video_clock;
 +    }
 +    /* update video clock for next frame */
 +    frame_delay = av_q2d(is->video_st->codec->time_base);
 +    /* for MPEG2, the frame can be repeated, so we update the
 +       clock accordingly */
 +    frame_delay += src_frame->repeat_pict * (frame_delay * 0.5);
 +    is->video_clock += frame_delay;
 +
 +#if defined(DEBUG_SYNC) && 0
 +    printf("frame_type=%c clock=%0.3f pts=%0.3f\n",
 +           av_get_picture_type_char(src_frame->pict_type), pts, pts1);
 +#endif
 +
 +    /* wait until we have space to put a new picture */
 +    SDL_LockMutex(is->pictq_mutex);
 +
 +    while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE &&
 +           !is->videoq.abort_request) {
 +        SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +    }
 +    SDL_UnlockMutex(is->pictq_mutex);
 +
 +    if (is->videoq.abort_request)
 +        return -1;
 +
 +    vp = &is->pictq[is->pictq_windex];
 +
 +    vp->duration = frame_delay;
 +
 +    /* alloc or resize hardware picture buffer */
 +    if (!vp->bmp || vp->reallocate ||
 +#if CONFIG_AVFILTER
 +        vp->width  != is->out_video_filter->inputs[0]->w ||
 +        vp->height != is->out_video_filter->inputs[0]->h) {
 +#else
 +        vp->width != is->video_st->codec->width ||
 +        vp->height != is->video_st->codec->height) {
 +#endif
 +        SDL_Event event;
 +
 +        vp->allocated  = 0;
 +        vp->reallocate = 0;
 +
 +        /* the allocation must be done in the main thread to avoid
 +           locking problems */
 +        event.type = FF_ALLOC_EVENT;
 +        event.user.data1 = is;
 +        SDL_PushEvent(&event);
 +
 +        /* wait until the picture is allocated */
 +        SDL_LockMutex(is->pictq_mutex);
 +        while (!vp->allocated && !is->videoq.abort_request) {
 +            SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +        }
 +        /* if the queue is aborted, we have to pop the pending ALLOC event or wait for the allocation to complete */
 +        if (is->videoq.abort_request && SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_EVENTMASK(FF_ALLOC_EVENT)) != 1) {
 +            while (!vp->allocated) {
 +                SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +            }
 +        }
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        if (is->videoq.abort_request)
 +            return -1;
 +    }
 +
 +    /* if the frame is not skipped, then display it */
 +    if (vp->bmp) {
 +        AVPicture pict = { { 0 } };
 +#if CONFIG_AVFILTER
 +        if (vp->picref)
 +            avfilter_unref_buffer(vp->picref);
 +        vp->picref = src_frame->opaque;
 +#endif
 +
 +        /* get a pointer on the bitmap */
 +        SDL_LockYUVOverlay (vp->bmp);
 +
 +        pict.data[0] = vp->bmp->pixels[0];
 +        pict.data[1] = vp->bmp->pixels[2];
 +        pict.data[2] = vp->bmp->pixels[1];
 +
 +        pict.linesize[0] = vp->bmp->pitches[0];
 +        pict.linesize[1] = vp->bmp->pitches[2];
 +        pict.linesize[2] = vp->bmp->pitches[1];
 +
 +#if CONFIG_AVFILTER
 +        // FIXME use direct rendering
 +        av_picture_copy(&pict, (AVPicture *)src_frame,
 +                        vp->pix_fmt, vp->width, vp->height);
 +#else
 +        sws_flags = av_get_int(sws_opts, "sws_flags", NULL);
 +        is->img_convert_ctx = sws_getCachedContext(is->img_convert_ctx,
 +            vp->width, vp->height, vp->pix_fmt, vp->width, vp->height,
 +            PIX_FMT_YUV420P, sws_flags, NULL, NULL, NULL);
 +        if (is->img_convert_ctx == NULL) {
 +            fprintf(stderr, "Cannot initialize the conversion context\n");
 +            exit(1);
 +        }
 +        sws_scale(is->img_convert_ctx, src_frame->data, src_frame->linesize,
 +                  0, vp->height, pict.data, pict.linesize);
 +#endif
 +        /* update the bitmap content */
 +        SDL_UnlockYUVOverlay(vp->bmp);
 +
 +        vp->pts = pts;
 +        vp->pos = pos;
 +        vp->skip = 0;
 +
 +        /* now we can update the picture count */
 +        if (++is->pictq_windex == VIDEO_PICTURE_QUEUE_SIZE)
 +            is->pictq_windex = 0;
 +        SDL_LockMutex(is->pictq_mutex);
 +        is->pictq_size++;
 +        SDL_UnlockMutex(is->pictq_mutex);
 +    }
 +    return 0;
 +}
 +
 +static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacket *pkt)
 +{
 +    int got_picture, i;
 +
 +    if (packet_queue_get(&is->videoq, pkt, 1) < 0)
 +        return -1;
 +
 +    if (pkt->data == flush_pkt.data) {
 +        avcodec_flush_buffers(is->video_st->codec);
 +
 +        SDL_LockMutex(is->pictq_mutex);
 +        // Make sure there are no long delay timers (ideally we should just flush the que but thats harder)
 +        for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +            is->pictq[i].skip = 1;
 +        }
 +        while (is->pictq_size && !is->videoq.abort_request) {
 +            SDL_CondWait(is->pictq_cond, is->pictq_mutex);
 +        }
 +        is->video_current_pos = -1;
 +        is->frame_last_pts = AV_NOPTS_VALUE;
 +        is->frame_last_duration = 0;
 +        is->frame_timer = (double)av_gettime() / 1000000.0;
 +        is->frame_last_dropped_pts = AV_NOPTS_VALUE;
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        return 0;
 +    }
 +
 +    avcodec_decode_video2(is->video_st->codec, frame, &got_picture, pkt);
 +
 +    if (got_picture) {
 +        int ret = 1;
 +
 +        if (decoder_reorder_pts == -1) {
 +            *pts = *(int64_t*)av_opt_ptr(avcodec_get_frame_class(), frame, "best_effort_timestamp");
 +        } else if (decoder_reorder_pts) {
 +            *pts = frame->pkt_pts;
 +        } else {
 +            *pts = frame->pkt_dts;
 +        }
 +
 +        if (*pts == AV_NOPTS_VALUE) {
 +            *pts = 0;
 +        }
 +
 +        if (((is->av_sync_type == AV_SYNC_AUDIO_MASTER && is->audio_st) || is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK) &&
 +             (framedrop>0 || (framedrop && is->audio_st))) {
 +            SDL_LockMutex(is->pictq_mutex);
 +            if (is->frame_last_pts != AV_NOPTS_VALUE && *pts) {
 +                double clockdiff = get_video_clock(is) - get_master_clock(is);
 +                double dpts = av_q2d(is->video_st->time_base) * *pts;
 +                double ptsdiff = dpts - is->frame_last_pts;
 +                if (fabs(clockdiff) < AV_NOSYNC_THRESHOLD &&
 +                     ptsdiff > 0 && ptsdiff < AV_NOSYNC_THRESHOLD &&
 +                     clockdiff + ptsdiff - is->frame_last_filter_delay < 0) {
 +                    is->frame_last_dropped_pos = pkt->pos;
 +                    is->frame_last_dropped_pts = dpts;
 +                    is->frame_drops_early++;
 +                    ret = 0;
 +                }
 +            }
 +            SDL_UnlockMutex(is->pictq_mutex);
 +        }
 +
 +        if (ret)
 +            is->frame_last_returned_time = av_gettime() / 1000000.0;
 +
 +        return ret;
 +    }
 +    return 0;
 +}
 +
 +#if CONFIG_AVFILTER
 +typedef struct {
 +    VideoState *is;
 +    AVFrame *frame;
 +    int use_dr1;
 +} FilterPriv;
 +
 +static int input_get_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    AVFilterContext *ctx = codec->opaque;
 +    AVFilterBufferRef  *ref;
 +    int perms = AV_PERM_WRITE;
 +    int i, w, h, stride[AV_NUM_DATA_POINTERS];
 +    unsigned edge;
 +    int pixel_size;
 +
 +    av_assert0(codec->flags & CODEC_FLAG_EMU_EDGE);
 +
 +    if (codec->codec->capabilities & CODEC_CAP_NEG_LINESIZES)
 +        perms |= AV_PERM_NEG_LINESIZES;
 +
 +    if (pic->buffer_hints & FF_BUFFER_HINTS_VALID) {
 +        if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE) perms |= AV_PERM_READ;
 +        if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) perms |= AV_PERM_PRESERVE;
 +        if (pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) perms |= AV_PERM_REUSE2;
 +    }
 +    if (pic->reference) perms |= AV_PERM_READ | AV_PERM_PRESERVE;
 +
 +    w = codec->width;
 +    h = codec->height;
 +
 +    if(av_image_check_size(w, h, 0, codec) || codec->pix_fmt<0)
 +        return -1;
 +
 +    avcodec_align_dimensions2(codec, &w, &h, stride);
 +    edge = codec->flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width();
 +    w += edge << 1;
 +    h += edge << 1;
 +    if (codec->pix_fmt != ctx->outputs[0]->format) {
 +        av_log(codec, AV_LOG_ERROR, "Pixel format mismatches %d %d\n", codec->pix_fmt, ctx->outputs[0]->format);
 +        return -1;
 +    }
 +    if (!(ref = avfilter_get_video_buffer(ctx->outputs[0], perms, w, h)))
 +        return -1;
 +
 +    pixel_size = av_pix_fmt_descriptors[ref->format].comp[0].step_minus1 + 1;
 +    ref->video->w = codec->width;
 +    ref->video->h = codec->height;
 +    for (i = 0; i < 4; i ++) {
 +        unsigned hshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_w : 0;
 +        unsigned vshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_h : 0;
 +
 +        if (ref->data[i]) {
 +            ref->data[i]    += ((edge * pixel_size) >> hshift) + ((edge * ref->linesize[i]) >> vshift);
 +        }
 +        pic->data[i]     = ref->data[i];
 +        pic->linesize[i] = ref->linesize[i];
 +    }
 +    pic->opaque = ref;
 +    pic->type   = FF_BUFFER_TYPE_USER;
 +    pic->reordered_opaque = codec->reordered_opaque;
 +    pic->width               = codec->width;
 +    pic->height              = codec->height;
 +    pic->format              = codec->pix_fmt;
 +    pic->sample_aspect_ratio = codec->sample_aspect_ratio;
 +    if (codec->pkt) pic->pkt_pts = codec->pkt->pts;
 +    else            pic->pkt_pts = AV_NOPTS_VALUE;
 +    return 0;
 +}
 +
 +static void input_release_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    memset(pic->data, 0, sizeof(pic->data));
 +    avfilter_unref_buffer(pic->opaque);
 +}
 +
 +static int input_reget_buffer(AVCodecContext *codec, AVFrame *pic)
 +{
 +    AVFilterBufferRef *ref = pic->opaque;
 +
 +    if (pic->data[0] == NULL) {
 +        pic->buffer_hints |= FF_BUFFER_HINTS_READABLE;
 +        return codec->get_buffer(codec, pic);
 +    }
 +
 +    if ((codec->width != ref->video->w) || (codec->height != ref->video->h) ||
 +        (codec->pix_fmt != ref->format)) {
 +        av_log(codec, AV_LOG_ERROR, "Picture properties changed.\n");
 +        return -1;
 +    }
 +
 +    pic->reordered_opaque = codec->reordered_opaque;
 +    if (codec->pkt) pic->pkt_pts = codec->pkt->pts;
 +    else            pic->pkt_pts = AV_NOPTS_VALUE;
 +    return 0;
 +}
 +
 +static int input_init(AVFilterContext *ctx, const char *args, void *opaque)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    AVCodecContext *codec;
 +    if (!opaque) return -1;
 +
 +    priv->is = opaque;
 +    codec    = priv->is->video_st->codec;
 +    codec->opaque = ctx;
 +    if (codec->codec->capabilities & CODEC_CAP_DR1) {
 +        av_assert0(codec->flags & CODEC_FLAG_EMU_EDGE);
 +        priv->use_dr1 = 1;
 +        codec->get_buffer     = input_get_buffer;
 +        codec->release_buffer = input_release_buffer;
 +        codec->reget_buffer   = input_reget_buffer;
 +        codec->thread_safe_callbacks = 1;
 +    }
 +
 +    priv->frame = avcodec_alloc_frame();
 +
 +    return 0;
 +}
 +
 +static void input_uninit(AVFilterContext *ctx)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    av_free(priv->frame);
 +}
 +
 +static int input_request_frame(AVFilterLink *link)
 +{
 +    FilterPriv *priv = link->src->priv;
 +    AVFilterBufferRef *picref;
 +    int64_t pts = 0;
 +    AVPacket pkt;
 +    int ret;
 +
 +    while (!(ret = get_video_frame(priv->is, priv->frame, &pts, &pkt)))
 +        av_free_packet(&pkt);
 +    if (ret < 0)
 +        return -1;
 +
 +    if (priv->use_dr1 && priv->frame->opaque) {
 +        picref = avfilter_ref_buffer(priv->frame->opaque, ~0);
 +    } else {
 +        picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h);
 +        av_image_copy(picref->data, picref->linesize,
 +                      (const uint8_t **)(void **)priv->frame->data, priv->frame->linesize,
 +                      picref->format, link->w, link->h);
 +    }
 +    av_free_packet(&pkt);
 +
 +    avfilter_copy_frame_props(picref, priv->frame);
 +    picref->pts = pts;
 +
 +    avfilter_start_frame(link, picref);
 +    avfilter_draw_slice(link, 0, link->h, 1);
 +    avfilter_end_frame(link);
 +
 +    return 0;
 +}
 +
 +static int input_query_formats(AVFilterContext *ctx)
 +{
 +    FilterPriv *priv = ctx->priv;
 +    enum PixelFormat pix_fmts[] = {
 +        priv->is->video_st->codec->pix_fmt, PIX_FMT_NONE
 +    };
 +
 +    avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts));
 +    return 0;
 +}
 +
 +static int input_config_props(AVFilterLink *link)
 +{
 +    FilterPriv *priv  = link->src->priv;
 +    AVStream *s = priv->is->video_st;
 +
 +    link->w = s->codec->width;
 +    link->h = s->codec->height;
 +    link->sample_aspect_ratio = s->sample_aspect_ratio.num ?
 +        s->sample_aspect_ratio : s->codec->sample_aspect_ratio;
 +    link->time_base = s->time_base;
 +
 +    return 0;
 +}
 +
 +static AVFilter input_filter =
 +{
 +    .name      = "ffplay_input",
 +
 +    .priv_size = sizeof(FilterPriv),
 +
 +    .init      = input_init,
 +    .uninit    = input_uninit,
 +
 +    .query_formats = input_query_formats,
 +
 +    .inputs    = (AVFilterPad[]) {{ .name = NULL }},
 +    .outputs   = (AVFilterPad[]) {{ .name = "default",
 +                                    .type = AVMEDIA_TYPE_VIDEO,
 +                                    .request_frame = input_request_frame,
 +                                    .config_props  = input_config_props, },
 +                                  { .name = NULL }},
 +};
 +
 +static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const char *vfilters)
 +{
 +    static const enum PixelFormat pix_fmts[] = { PIX_FMT_YUV420P, PIX_FMT_NONE };
 +    char sws_flags_str[128];
 +    int ret;
 +    AVBufferSinkParams *buffersink_params = av_buffersink_params_alloc();
 +    AVFilterContext *filt_src = NULL, *filt_out = NULL;
 +    snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags);
 +    graph->scale_sws_opts = av_strdup(sws_flags_str);
 +
 +    if ((ret = avfilter_graph_create_filter(&filt_src, &input_filter, "src",
 +                                            NULL, is, graph)) < 0)
 +        return ret;
 +
 +#if FF_API_OLD_VSINK_API
 +    ret = avfilter_graph_create_filter(&filt_out, avfilter_get_by_name("buffersink"), "out",
 +                                       NULL, pix_fmts, graph);
 +#else
 +    buffersink_params->pixel_fmts = pix_fmts;
 +    ret = avfilter_graph_create_filter(&filt_out, avfilter_get_by_name("buffersink"), "out",
 +                                       NULL, buffersink_params, graph);
 +#endif
 +    av_freep(&buffersink_params);
 +    if (ret < 0)
 +        return ret;
 +
 +    if (vfilters) {
 +        AVFilterInOut *outputs = avfilter_inout_alloc();
 +        AVFilterInOut *inputs  = avfilter_inout_alloc();
 +
 +        outputs->name    = av_strdup("in");
 +        outputs->filter_ctx = filt_src;
 +        outputs->pad_idx = 0;
 +        outputs->next    = NULL;
 +
 +        inputs->name    = av_strdup("out");
 +        inputs->filter_ctx = filt_out;
 +        inputs->pad_idx = 0;
 +        inputs->next    = NULL;
 +
 +        if ((ret = avfilter_graph_parse(graph, vfilters, &inputs, &outputs, NULL)) < 0)
 +            return ret;
 +    } else {
 +        if ((ret = avfilter_link(filt_src, 0, filt_out, 0)) < 0)
 +            return ret;
 +    }
 +
 +    if ((ret = avfilter_graph_config(graph, NULL)) < 0)
 +        return ret;
 +
 +    is->out_video_filter = filt_out;
 +
 +    return ret;
 +}
 +
 +#endif  /* CONFIG_AVFILTER */
 +
 +static int video_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    AVFrame *frame = avcodec_alloc_frame();
 +    int64_t pts_int = AV_NOPTS_VALUE, pos = -1;
 +    double pts;
 +    int ret;
 +
 +#if CONFIG_AVFILTER
 +    AVFilterGraph *graph = avfilter_graph_alloc();
 +    AVFilterContext *filt_out = NULL;
 +    int last_w = is->video_st->codec->width;
 +    int last_h = is->video_st->codec->height;
 +
 +    if ((ret = configure_video_filters(graph, is, vfilters)) < 0)
 +        goto the_end;
 +    filt_out = is->out_video_filter;
 +#endif
 +
 +    for (;;) {
 +#if !CONFIG_AVFILTER
 +        AVPacket pkt;
 +#else
 +        AVFilterBufferRef *picref;
 +        AVRational tb = filt_out->inputs[0]->time_base;
 +#endif
 +        while (is->paused && !is->videoq.abort_request)
 +            SDL_Delay(10);
 +#if CONFIG_AVFILTER
 +        if (   last_w != is->video_st->codec->width
 +            || last_h != is->video_st->codec->height) {
 +            av_log(NULL, AV_LOG_INFO, "Frame changed from size:%dx%d to size:%dx%d\n",
 +                   last_w, last_h, is->video_st->codec->width, is->video_st->codec->height);
 +            avfilter_graph_free(&graph);
 +            graph = avfilter_graph_alloc();
 +            if ((ret = configure_video_filters(graph, is, vfilters)) < 0)
 +                goto the_end;
 +            filt_out = is->out_video_filter;
 +            last_w = is->video_st->codec->width;
 +            last_h = is->video_st->codec->height;
 +        }
 +        ret = av_buffersink_get_buffer_ref(filt_out, &picref, 0);
 +        if (picref) {
 +            avfilter_fill_frame_from_video_buffer_ref(frame, picref);
 +            pts_int = picref->pts;
 +            pos     = picref->pos;
 +            frame->opaque = picref;
 +        }
 +
 +        if (ret >= 0 && av_cmp_q(tb, is->video_st->time_base)) {
 +            av_unused int64_t pts1 = pts_int;
 +            pts_int = av_rescale_q(pts_int, tb, is->video_st->time_base);
 +            av_dlog(NULL, "video_thread(): "
 +                    "tb:%d/%d pts:%"PRId64" -> tb:%d/%d pts:%"PRId64"\n",
 +                    tb.num, tb.den, pts1,
 +                    is->video_st->time_base.num, is->video_st->time_base.den, pts_int);
 +        }
 +#else
 +        ret = get_video_frame(is, frame, &pts_int, &pkt);
 +        pos = pkt.pos;
 +        av_free_packet(&pkt);
 +#endif
 +
 +        if (ret < 0)
 +            goto the_end;
 +
 +        is->frame_last_filter_delay = av_gettime() / 1000000.0 - is->frame_last_returned_time;
 +        if (fabs(is->frame_last_filter_delay) > AV_NOSYNC_THRESHOLD / 10.0)
 +            is->frame_last_filter_delay = 0;
 +
 +#if CONFIG_AVFILTER
 +        if (!picref)
 +            continue;
 +#endif
 +
 +        pts = pts_int * av_q2d(is->video_st->time_base);
 +
 +        ret = queue_picture(is, frame, pts, pos);
 +
 +        if (ret < 0)
 +            goto the_end;
 +
 +        if (is->step)
 +            stream_toggle_pause(is);
 +    }
 + the_end:
 +#if CONFIG_AVFILTER
 +    av_freep(&vfilters);
 +    avfilter_graph_free(&graph);
 +#endif
 +    av_free(frame);
 +    return 0;
 +}
 +
 +static int subtitle_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    SubPicture *sp;
 +    AVPacket pkt1, *pkt = &pkt1;
 +    int got_subtitle;
 +    double pts;
 +    int i, j;
 +    int r, g, b, y, u, v, a;
 +
 +    for (;;) {
 +        while (is->paused && !is->subtitleq.abort_request) {
 +            SDL_Delay(10);
 +        }
 +        if (packet_queue_get(&is->subtitleq, pkt, 1) < 0)
 +            break;
 +
 +        if (pkt->data == flush_pkt.data) {
 +            avcodec_flush_buffers(is->subtitle_st->codec);
 +            continue;
 +        }
 +        SDL_LockMutex(is->subpq_mutex);
 +        while (is->subpq_size >= SUBPICTURE_QUEUE_SIZE &&
 +               !is->subtitleq.abort_request) {
 +            SDL_CondWait(is->subpq_cond, is->subpq_mutex);
 +        }
 +        SDL_UnlockMutex(is->subpq_mutex);
 +
 +        if (is->subtitleq.abort_request)
 +            return 0;
 +
 +        sp = &is->subpq[is->subpq_windex];
 +
 +       /* NOTE: ipts is the PTS of the _first_ picture beginning in
 +           this packet, if any */
 +        pts = 0;
 +        if (pkt->pts != AV_NOPTS_VALUE)
 +            pts = av_q2d(is->subtitle_st->time_base) * pkt->pts;
 +
 +        avcodec_decode_subtitle2(is->subtitle_st->codec, &sp->sub,
 +                                 &got_subtitle, pkt);
 +
 +        if (got_subtitle && sp->sub.format == 0) {
 +            sp->pts = pts;
 +
 +            for (i = 0; i < sp->sub.num_rects; i++)
 +            {
 +                for (j = 0; j < sp->sub.rects[i]->nb_colors; j++)
 +                {
 +                    RGBA_IN(r, g, b, a, (uint32_t*)sp->sub.rects[i]->pict.data[1] + j);
 +                    y = RGB_TO_Y_CCIR(r, g, b);
 +                    u = RGB_TO_U_CCIR(r, g, b, 0);
 +                    v = RGB_TO_V_CCIR(r, g, b, 0);
 +                    YUVA_OUT((uint32_t*)sp->sub.rects[i]->pict.data[1] + j, y, u, v, a);
 +                }
 +            }
 +
 +            /* now we can update the picture count */
 +            if (++is->subpq_windex == SUBPICTURE_QUEUE_SIZE)
 +                is->subpq_windex = 0;
 +            SDL_LockMutex(is->subpq_mutex);
 +            is->subpq_size++;
 +            SDL_UnlockMutex(is->subpq_mutex);
 +        }
 +        av_free_packet(pkt);
 +    }
 +    return 0;
 +}
 +
 +/* copy samples for viewing in editor window */
 +static void update_sample_display(VideoState *is, short *samples, int samples_size)
 +{
 +    int size, len;
 +
 +    size = samples_size / sizeof(short);
 +    while (size > 0) {
 +        len = SAMPLE_ARRAY_SIZE - is->sample_array_index;
 +        if (len > size)
 +            len = size;
 +        memcpy(is->sample_array + is->sample_array_index, samples, len * sizeof(short));
 +        samples += len;
 +        is->sample_array_index += len;
 +        if (is->sample_array_index >= SAMPLE_ARRAY_SIZE)
 +            is->sample_array_index = 0;
 +        size -= len;
 +    }
 +}
 +
 +/* return the wanted number of samples to get better sync if sync_type is video
 + * or external master clock */
 +static int synchronize_audio(VideoState *is, int nb_samples)
 +{
 +    int wanted_nb_samples = nb_samples;
 +
 +    /* if not master, then we try to remove or add samples to correct the clock */
 +    if (((is->av_sync_type == AV_SYNC_VIDEO_MASTER && is->video_st) ||
 +         is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK)) {
 +        double diff, avg_diff;
 +        int min_nb_samples, max_nb_samples;
 +
 +        diff = get_audio_clock(is) - get_master_clock(is);
 +
 +        if (diff < AV_NOSYNC_THRESHOLD) {
 +            is->audio_diff_cum = diff + is->audio_diff_avg_coef * is->audio_diff_cum;
 +            if (is->audio_diff_avg_count < AUDIO_DIFF_AVG_NB) {
 +                /* not enough measures to have a correct estimate */
 +                is->audio_diff_avg_count++;
 +            } else {
 +                /* estimate the A-V difference */
 +                avg_diff = is->audio_diff_cum * (1.0 - is->audio_diff_avg_coef);
 +
 +                if (fabs(avg_diff) >= is->audio_diff_threshold) {
 +                    wanted_nb_samples = nb_samples + (int)(diff * is->audio_src_freq);
 +                    min_nb_samples = ((nb_samples * (100 - SAMPLE_CORRECTION_PERCENT_MAX) / 100));
 +                    max_nb_samples = ((nb_samples * (100 + SAMPLE_CORRECTION_PERCENT_MAX) / 100));
 +                    wanted_nb_samples = FFMIN(FFMAX(wanted_nb_samples, min_nb_samples), max_nb_samples);
 +                }
 +                av_dlog(NULL, "diff=%f adiff=%f sample_diff=%d apts=%0.3f vpts=%0.3f %f\n",
 +                        diff, avg_diff, wanted_nb_samples - nb_samples,
 +                        is->audio_clock, is->video_clock, is->audio_diff_threshold);
 +            }
 +        } else {
 +            /* too big difference : may be initial PTS errors, so
 +               reset A-V filter */
 +            is->audio_diff_avg_count = 0;
 +            is->audio_diff_cum       = 0;
 +        }
 +    }
 +
 +    return wanted_nb_samples;
 +}
 +
 +/* decode one audio frame and returns its uncompressed size */
 +static int audio_decode_frame(VideoState *is, double *pts_ptr)
 +{
 +    AVPacket *pkt_temp = &is->audio_pkt_temp;
 +    AVPacket *pkt = &is->audio_pkt;
 +    AVCodecContext *dec = is->audio_st->codec;
 +    int len1, len2, data_size, resampled_data_size;
 +    int64_t dec_channel_layout;
 +    int got_frame;
 +    double pts;
 +    int new_packet = 0;
 +    int flush_complete = 0;
 +    int wanted_nb_samples;
 +
 +    for (;;) {
 +        /* NOTE: the audio packet can contain several frames */
 +        while (pkt_temp->size > 0 || (!pkt_temp->data && new_packet)) {
 +            if (!is->frame) {
 +                if (!(is->frame = avcodec_alloc_frame()))
 +                    return AVERROR(ENOMEM);
 +            } else
 +                avcodec_get_frame_defaults(is->frame);
 +
 +            if (flush_complete)
 +                break;
 +            new_packet = 0;
 +            len1 = avcodec_decode_audio4(dec, is->frame, &got_frame, pkt_temp);
 +            if (len1 < 0) {
 +                /* if error, we skip the frame */
 +                pkt_temp->size = 0;
 +                break;
 +            }
 +
 +            pkt_temp->data += len1;
 +            pkt_temp->size -= len1;
 +
 +            if (!got_frame) {
 +                /* stop sending empty packets if the decoder is finished */
 +                if (!pkt_temp->data && dec->codec->capabilities & CODEC_CAP_DELAY)
 +                    flush_complete = 1;
 +                continue;
 +            }
 +            data_size = av_samples_get_buffer_size(NULL, dec->channels,
 +                                                   is->frame->nb_samples,
 +                                                   dec->sample_fmt, 1);
 +
 +            dec_channel_layout = (dec->channel_layout && dec->channels == av_get_channel_layout_nb_channels(dec->channel_layout)) ? dec->channel_layout : av_get_default_channel_layout(dec->channels);
 +            wanted_nb_samples = synchronize_audio(is, is->frame->nb_samples);
 +
 +            if (dec->sample_fmt != is->audio_src_fmt ||
 +                dec_channel_layout != is->audio_src_channel_layout ||
 +                dec->sample_rate != is->audio_src_freq ||
 +                (wanted_nb_samples != is->frame->nb_samples && !is->swr_ctx)) {
 +                if (is->swr_ctx)
 +                    swr_free(&is->swr_ctx);
 +                is->swr_ctx = swr_alloc_set_opts(NULL,
 +                                                 is->audio_tgt_channel_layout, is->audio_tgt_fmt, is->audio_tgt_freq,
 +                                                 dec_channel_layout,           dec->sample_fmt,   dec->sample_rate,
 +                                                 0, NULL);
 +                if (!is->swr_ctx || swr_init(is->swr_ctx) < 0) {
 +                    fprintf(stderr, "Cannot create sample rate converter for conversion of %d Hz %s %d channels to %d Hz %s %d channels!\n",
 +                        dec->sample_rate,
 +                        av_get_sample_fmt_name(dec->sample_fmt),
 +                        dec->channels,
 +                        is->audio_tgt_freq,
 +                        av_get_sample_fmt_name(is->audio_tgt_fmt),
 +                        is->audio_tgt_channels);
 +                    break;
 +                }
 +                is->audio_src_channel_layout = dec_channel_layout;
 +                is->audio_src_channels = dec->channels;
 +                is->audio_src_freq = dec->sample_rate;
 +                is->audio_src_fmt = dec->sample_fmt;
 +            }
 +
 +            resampled_data_size = data_size;
 +            if (is->swr_ctx) {
 +                const uint8_t *in[] = { is->frame->data[0] };
 +                uint8_t *out[] = {is->audio_buf2};
 +                if (wanted_nb_samples != is->frame->nb_samples) {
 +                    if (swr_set_compensation(is->swr_ctx, (wanted_nb_samples - is->frame->nb_samples) * is->audio_tgt_freq / dec->sample_rate,
 +                                                wanted_nb_samples * is->audio_tgt_freq / dec->sample_rate) < 0) {
 +                        fprintf(stderr, "swr_set_compensation() failed\n");
 +                        break;
 +                    }
 +                }
 +                len2 = swr_convert(is->swr_ctx, out, sizeof(is->audio_buf2) / is->audio_tgt_channels / av_get_bytes_per_sample(is->audio_tgt_fmt),
 +                                                in, is->frame->nb_samples);
 +                if (len2 < 0) {
 +                    fprintf(stderr, "audio_resample() failed\n");
 +                    break;
 +                }
 +                if (len2 == sizeof(is->audio_buf2) / is->audio_tgt_channels / av_get_bytes_per_sample(is->audio_tgt_fmt)) {
 +                    fprintf(stderr, "warning: audio buffer is probably too small\n");
 +                    swr_init(is->swr_ctx);
 +                }
 +                is->audio_buf = is->audio_buf2;
 +                resampled_data_size = len2 * is->audio_tgt_channels * av_get_bytes_per_sample(is->audio_tgt_fmt);
 +            } else {
 +                is->audio_buf = is->frame->data[0];
 +            }
 +
 +            /* if no pts, then compute it */
 +            pts = is->audio_clock;
 +            *pts_ptr = pts;
 +            is->audio_clock += (double)data_size / (dec->channels * dec->sample_rate * av_get_bytes_per_sample(dec->sample_fmt));
 +#ifdef DEBUG
 +            {
 +                static double last_clock;
 +                printf("audio: delay=%0.3f clock=%0.3f pts=%0.3f\n",
 +                       is->audio_clock - last_clock,
 +                       is->audio_clock, pts);
 +                last_clock = is->audio_clock;
 +            }
 +#endif
 +            return resampled_data_size;
 +        }
 +
 +        /* free the current packet */
 +        if (pkt->data)
 +            av_free_packet(pkt);
 +        memset(pkt_temp, 0, sizeof(*pkt_temp));
 +
 +        if (is->paused || is->audioq.abort_request) {
 +            return -1;
 +        }
 +
 +        /* read next packet */
 +        if ((new_packet = packet_queue_get(&is->audioq, pkt, 1)) < 0)
 +            return -1;
 +
 +        if (pkt->data == flush_pkt.data) {
 +            avcodec_flush_buffers(dec);
 +            flush_complete = 0;
 +        }
 +
 +        *pkt_temp = *pkt;
 +
 +        /* if update the audio clock with the pts */
 +        if (pkt->pts != AV_NOPTS_VALUE) {
 +            is->audio_clock = av_q2d(is->audio_st->time_base)*pkt->pts;
 +        }
 +    }
 +}
 +
 +/* prepare a new audio buffer */
 +static void sdl_audio_callback(void *opaque, Uint8 *stream, int len)
 +{
 +    VideoState *is = opaque;
 +    int audio_size, len1;
 +    int bytes_per_sec;
 +    int frame_size = av_samples_get_buffer_size(NULL, is->audio_tgt_channels, 1, is->audio_tgt_fmt, 1);
 +    double pts;
 +
 +    audio_callback_time = av_gettime();
 +
 +    while (len > 0) {
 +        if (is->audio_buf_index >= is->audio_buf_size) {
 +           audio_size = audio_decode_frame(is, &pts);
 +           if (audio_size < 0) {
 +                /* if error, just output silence */
 +               is->audio_buf      = is->silence_buf;
 +               is->audio_buf_size = sizeof(is->silence_buf) / frame_size * frame_size;
 +           } else {
 +               if (is->show_mode != SHOW_MODE_VIDEO)
 +                   update_sample_display(is, (int16_t *)is->audio_buf, audio_size);
 +               is->audio_buf_size = audio_size;
 +           }
 +           is->audio_buf_index = 0;
 +        }
 +        len1 = is->audio_buf_size - is->audio_buf_index;
 +        if (len1 > len)
 +            len1 = len;
 +        memcpy(stream, (uint8_t *)is->audio_buf + is->audio_buf_index, len1);
 +        len -= len1;
 +        stream += len1;
 +        is->audio_buf_index += len1;
 +    }
 +    bytes_per_sec = is->audio_tgt_freq * is->audio_tgt_channels * av_get_bytes_per_sample(is->audio_tgt_fmt);
 +    is->audio_write_buf_size = is->audio_buf_size - is->audio_buf_index;
 +    /* Let's assume the audio driver that is used by SDL has two periods. */
 +    is->audio_current_pts = is->audio_clock - (double)(2 * is->audio_hw_buf_size + is->audio_write_buf_size) / bytes_per_sec;
 +    is->audio_current_pts_drift = is->audio_current_pts - audio_callback_time / 1000000.0;
 +}
 +
 +/* open a given stream. Return 0 if OK */
 +static int stream_component_open(VideoState *is, int stream_index)
 +{
 +    AVFormatContext *ic = is->ic;
 +    AVCodecContext *avctx;
 +    AVCodec *codec;
 +    SDL_AudioSpec wanted_spec, spec;
 +    AVDictionary *opts;
 +    AVDictionaryEntry *t = NULL;
 +    int64_t wanted_channel_layout = 0;
 +    int wanted_nb_channels;
 +    const char *env;
 +
 +    if (stream_index < 0 || stream_index >= ic->nb_streams)
 +        return -1;
 +    avctx = ic->streams[stream_index]->codec;
 +
 +    codec = avcodec_find_decoder(avctx->codec_id);
 +    opts = filter_codec_opts(codec_opts, codec, ic, ic->streams[stream_index]);
 +
 +    switch(avctx->codec_type){
 +        case AVMEDIA_TYPE_AUDIO   : if(audio_codec_name   ) codec= avcodec_find_decoder_by_name(   audio_codec_name); break;
 +        case AVMEDIA_TYPE_SUBTITLE: if(subtitle_codec_name) codec= avcodec_find_decoder_by_name(subtitle_codec_name); break;
 +        case AVMEDIA_TYPE_VIDEO   : if(video_codec_name   ) codec= avcodec_find_decoder_by_name(   video_codec_name); break;
 +    }
 +    if (!codec)
 +        return -1;
 +
 +    avctx->workaround_bugs   = workaround_bugs;
 +    avctx->lowres            = lowres;
 +    if(avctx->lowres > codec->max_lowres){
 +        av_log(avctx, AV_LOG_WARNING, "The maximum value for lowres supported by the decoder is %d\n",
 +                codec->max_lowres);
 +        avctx->lowres= codec->max_lowres;
 +    }
 +    avctx->idct_algo         = idct;
 +    avctx->skip_frame        = skip_frame;
 +    avctx->skip_idct         = skip_idct;
 +    avctx->skip_loop_filter  = skip_loop_filter;
 +    avctx->error_concealment = error_concealment;
 +
 +    if(avctx->lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE;
 +    if (fast)   avctx->flags2 |= CODEC_FLAG2_FAST;
 +    if(codec->capabilities & CODEC_CAP_DR1)
 +        avctx->flags |= CODEC_FLAG_EMU_EDGE;
 +
 +    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
 +        memset(&is->audio_pkt_temp, 0, sizeof(is->audio_pkt_temp));
 +        env = SDL_getenv("SDL_AUDIO_CHANNELS");
 +        if (env)
 +            wanted_channel_layout = av_get_default_channel_layout(SDL_atoi(env));
 +        if (!wanted_channel_layout) {
 +            wanted_channel_layout = (avctx->channel_layout && avctx->channels == av_get_channel_layout_nb_channels(avctx->channel_layout)) ? avctx->channel_layout : av_get_default_channel_layout(avctx->channels);
 +            wanted_channel_layout &= ~AV_CH_LAYOUT_STEREO_DOWNMIX;
 +            wanted_nb_channels = av_get_channel_layout_nb_channels(wanted_channel_layout);
 +            /* SDL only supports 1, 2, 4 or 6 channels at the moment, so we have to make sure not to request anything else. */
 +            while (wanted_nb_channels > 0 && (wanted_nb_channels == 3 || wanted_nb_channels == 5 || wanted_nb_channels > 6)) {
 +                wanted_nb_channels--;
 +                wanted_channel_layout = av_get_default_channel_layout(wanted_nb_channels);
 +            }
 +        }
 +        wanted_spec.channels = av_get_channel_layout_nb_channels(wanted_channel_layout);
 +        wanted_spec.freq = avctx->sample_rate;
 +        if (wanted_spec.freq <= 0 || wanted_spec.channels <= 0) {
 +            fprintf(stderr, "Invalid sample rate or channel count!\n");
 +            return -1;
 +        }
 +    }
 +
 +    if (!av_dict_get(opts, "threads", NULL, 0))
 +        av_dict_set(&opts, "threads", "auto", 0);
 +    if (!codec ||
 +        avcodec_open2(avctx, codec, &opts) < 0)
 +        return -1;
 +    if ((t = av_dict_get(opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
 +        av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
 +        return AVERROR_OPTION_NOT_FOUND;
 +    }
 +
 +    /* prepare audio output */
 +    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
 +        wanted_spec.format = AUDIO_S16SYS;
 +        wanted_spec.silence = 0;
 +        wanted_spec.samples = SDL_AUDIO_BUFFER_SIZE;
 +        wanted_spec.callback = sdl_audio_callback;
 +        wanted_spec.userdata = is;
 +        if (SDL_OpenAudio(&wanted_spec, &spec) < 0) {
 +            fprintf(stderr, "SDL_OpenAudio: %s\n", SDL_GetError());
 +            return -1;
 +        }
 +        is->audio_hw_buf_size = spec.size;
 +        if (spec.format != AUDIO_S16SYS) {
 +            fprintf(stderr, "SDL advised audio format %d is not supported!\n", spec.format);
 +            return -1;
 +        }
 +        if (spec.channels != wanted_spec.channels) {
 +            wanted_channel_layout = av_get_default_channel_layout(spec.channels);
 +            if (!wanted_channel_layout) {
 +                fprintf(stderr, "SDL advised channel count %d is not supported!\n", spec.channels);
 +                return -1;
 +            }
 +        }
 +        is->audio_src_fmt = is->audio_tgt_fmt = AV_SAMPLE_FMT_S16;
 +        is->audio_src_freq = is->audio_tgt_freq = spec.freq;
 +        is->audio_src_channel_layout = is->audio_tgt_channel_layout = wanted_channel_layout;
 +        is->audio_src_channels = is->audio_tgt_channels = spec.channels;
 +    }
 +
 +    ic->streams[stream_index]->discard = AVDISCARD_DEFAULT;
 +    switch (avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        is->audio_stream = stream_index;
 +        is->audio_st = ic->streams[stream_index];
 +        is->audio_buf_size  = 0;
 +        is->audio_buf_index = 0;
 +
 +        /* init averaging filter */
 +        is->audio_diff_avg_coef  = exp(log(0.01) / AUDIO_DIFF_AVG_NB);
 +        is->audio_diff_avg_count = 0;
 +        /* since we do not have a precise anough audio fifo fullness,
 +           we correct audio sync only if larger than this threshold */
 +        is->audio_diff_threshold = 2.0 * SDL_AUDIO_BUFFER_SIZE / wanted_spec.freq;
 +
 +        memset(&is->audio_pkt, 0, sizeof(is->audio_pkt));
 +        packet_queue_init(&is->audioq);
 +        SDL_PauseAudio(0);
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        is->video_stream = stream_index;
 +        is->video_st = ic->streams[stream_index];
 +
 +        packet_queue_init(&is->videoq);
 +        is->video_tid = SDL_CreateThread(video_thread, is);
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        is->subtitle_stream = stream_index;
 +        is->subtitle_st = ic->streams[stream_index];
 +        packet_queue_init(&is->subtitleq);
 +
 +        is->subtitle_tid = SDL_CreateThread(subtitle_thread, is);
 +        break;
 +    default:
 +        break;
 +    }
 +    return 0;
 +}
 +
 +static void stream_component_close(VideoState *is, int stream_index)
 +{
 +    AVFormatContext *ic = is->ic;
 +    AVCodecContext *avctx;
 +
 +    if (stream_index < 0 || stream_index >= ic->nb_streams)
 +        return;
 +    avctx = ic->streams[stream_index]->codec;
 +
 +    switch (avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        packet_queue_abort(&is->audioq);
 +
 +        SDL_CloseAudio();
 +
 +        packet_queue_end(&is->audioq);
 +        if (is->swr_ctx)
 +            swr_free(&is->swr_ctx);
 +        av_free_packet(&is->audio_pkt);
 +        av_freep(&is->audio_buf1);
 +        is->audio_buf = NULL;
 +        av_freep(&is->frame);
 +
 +        if (is->rdft) {
 +            av_rdft_end(is->rdft);
 +            av_freep(&is->rdft_data);
 +            is->rdft = NULL;
 +            is->rdft_bits = 0;
 +        }
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        packet_queue_abort(&is->videoq);
 +
 +        /* note: we also signal this mutex to make sure we deblock the
 +           video thread in all cases */
 +        SDL_LockMutex(is->pictq_mutex);
 +        SDL_CondSignal(is->pictq_cond);
 +        SDL_UnlockMutex(is->pictq_mutex);
 +
 +        SDL_WaitThread(is->video_tid, NULL);
 +
 +        packet_queue_end(&is->videoq);
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        packet_queue_abort(&is->subtitleq);
 +
 +        /* note: we also signal this mutex to make sure we deblock the
 +           video thread in all cases */
 +        SDL_LockMutex(is->subpq_mutex);
 +        is->subtitle_stream_changed = 1;
 +
 +        SDL_CondSignal(is->subpq_cond);
 +        SDL_UnlockMutex(is->subpq_mutex);
 +
 +        SDL_WaitThread(is->subtitle_tid, NULL);
 +
 +        packet_queue_end(&is->subtitleq);
 +        break;
 +    default:
 +        break;
 +    }
 +
 +    ic->streams[stream_index]->discard = AVDISCARD_ALL;
 +    avcodec_close(avctx);
 +    switch (avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        is->audio_st = NULL;
 +        is->audio_stream = -1;
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        is->video_st = NULL;
 +        is->video_stream = -1;
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        is->subtitle_st = NULL;
 +        is->subtitle_stream = -1;
 +        break;
 +    default:
 +        break;
 +    }
 +}
 +
 +static int decode_interrupt_cb(void *ctx)
 +{
 +    VideoState *is = ctx;
 +    return is->abort_request;
 +}
 +
 +/* this thread gets the stream from the disk or the network */
 +static int read_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    AVFormatContext *ic = NULL;
 +    int err, i, ret;
 +    int st_index[AVMEDIA_TYPE_NB];
 +    AVPacket pkt1, *pkt = &pkt1;
 +    int eof = 0;
 +    int pkt_in_play_range = 0;
 +    AVDictionaryEntry *t;
 +    AVDictionary **opts;
 +    int orig_nb_streams;
 +
 +    memset(st_index, -1, sizeof(st_index));
 +    is->video_stream = -1;
 +    is->audio_stream = -1;
 +    is->subtitle_stream = -1;
 +
 +    ic = avformat_alloc_context();
 +    ic->interrupt_callback.callback = decode_interrupt_cb;
 +    ic->interrupt_callback.opaque = is;
 +    err = avformat_open_input(&ic, is->filename, is->iformat, &format_opts);
 +    if (err < 0) {
 +        print_error(is->filename, err);
 +        ret = -1;
 +        goto fail;
 +    }
 +    if ((t = av_dict_get(format_opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
 +        av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
 +        ret = AVERROR_OPTION_NOT_FOUND;
 +        goto fail;
 +    }
 +    is->ic = ic;
 +
 +    if (genpts)
 +        ic->flags |= AVFMT_FLAG_GENPTS;
 +
 +    opts = setup_find_stream_info_opts(ic, codec_opts);
 +    orig_nb_streams = ic->nb_streams;
 +
 +    err = avformat_find_stream_info(ic, opts);
 +    if (err < 0) {
 +        fprintf(stderr, "%s: could not find codec parameters\n", is->filename);
 +        ret = -1;
 +        goto fail;
 +    }
 +    for (i = 0; i < orig_nb_streams; i++)
 +        av_dict_free(&opts[i]);
 +    av_freep(&opts);
 +
 +    if (ic->pb)
 +        ic->pb->eof_reached = 0; // FIXME hack, ffplay maybe should not use url_feof() to test for the end
 +
 +    if (seek_by_bytes < 0)
 +        seek_by_bytes = !!(ic->iformat->flags & AVFMT_TS_DISCONT);
 +
 +    /* if seeking requested, we execute it */
 +    if (start_time != AV_NOPTS_VALUE) {
 +        int64_t timestamp;
 +
 +        timestamp = start_time;
 +        /* add the stream start time */
 +        if (ic->start_time != AV_NOPTS_VALUE)
 +            timestamp += ic->start_time;
 +        ret = avformat_seek_file(ic, -1, INT64_MIN, timestamp, INT64_MAX, 0);
 +        if (ret < 0) {
 +            fprintf(stderr, "%s: could not seek to position %0.3f\n",
 +                    is->filename, (double)timestamp / AV_TIME_BASE);
 +        }
 +    }
 +
 +    for (i = 0; i < ic->nb_streams; i++)
 +        ic->streams[i]->discard = AVDISCARD_ALL;
 +    if (!video_disable)
 +        st_index[AVMEDIA_TYPE_VIDEO] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_VIDEO,
 +                                wanted_stream[AVMEDIA_TYPE_VIDEO], -1, NULL, 0);
 +    if (!audio_disable)
 +        st_index[AVMEDIA_TYPE_AUDIO] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_AUDIO,
 +                                wanted_stream[AVMEDIA_TYPE_AUDIO],
 +                                st_index[AVMEDIA_TYPE_VIDEO],
 +                                NULL, 0);
 +    if (!video_disable)
 +        st_index[AVMEDIA_TYPE_SUBTITLE] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_SUBTITLE,
 +                                wanted_stream[AVMEDIA_TYPE_SUBTITLE],
 +                                (st_index[AVMEDIA_TYPE_AUDIO] >= 0 ?
 +                                 st_index[AVMEDIA_TYPE_AUDIO] :
 +                                 st_index[AVMEDIA_TYPE_VIDEO]),
 +                                NULL, 0);
 +    if (show_status) {
 +        av_dump_format(ic, 0, is->filename, 0);
 +    }
 +
 +    is->show_mode = show_mode;
 +
 +    /* open the streams */
 +    if (st_index[AVMEDIA_TYPE_AUDIO] >= 0) {
 +        stream_component_open(is, st_index[AVMEDIA_TYPE_AUDIO]);
 +    }
 +
 +    ret = -1;
 +    if (st_index[AVMEDIA_TYPE_VIDEO] >= 0) {
 +        ret = stream_component_open(is, st_index[AVMEDIA_TYPE_VIDEO]);
 +    }
 +    is->refresh_tid = SDL_CreateThread(refresh_thread, is);
 +    if (is->show_mode == SHOW_MODE_NONE)
 +        is->show_mode = ret >= 0 ? SHOW_MODE_VIDEO : SHOW_MODE_RDFT;
 +
 +    if (st_index[AVMEDIA_TYPE_SUBTITLE] >= 0) {
 +        stream_component_open(is, st_index[AVMEDIA_TYPE_SUBTITLE]);
 +    }
 +
 +    if (is->video_stream < 0 && is->audio_stream < 0) {
 +        fprintf(stderr, "%s: could not open codecs\n", is->filename);
 +        ret = -1;
 +        goto fail;
 +    }
 +
 +    for (;;) {
 +        if (is->abort_request)
 +            break;
 +        if (is->paused != is->last_paused) {
 +            is->last_paused = is->paused;
 +            if (is->paused)
 +                is->read_pause_return = av_read_pause(ic);
 +            else
 +                av_read_play(ic);
 +        }
 +#if CONFIG_RTSP_DEMUXER || CONFIG_MMSH_PROTOCOL
 +        if (is->paused &&
 +                (!strcmp(ic->iformat->name, "rtsp") ||
 +                 (ic->pb && !strncmp(input_filename, "mmsh:", 5)))) {
 +            /* wait 10 ms to avoid trying to get another packet */
 +            /* XXX: horrible */
 +            SDL_Delay(10);
 +            continue;
 +        }
 +#endif
 +        if (is->seek_req) {
 +            int64_t seek_target = is->seek_pos;
 +            int64_t seek_min    = is->seek_rel > 0 ? seek_target - is->seek_rel + 2: INT64_MIN;
 +            int64_t seek_max    = is->seek_rel < 0 ? seek_target - is->seek_rel - 2: INT64_MAX;
 +// FIXME the +-2 is due to rounding being not done in the correct direction in generation
 +//      of the seek_pos/seek_rel variables
 +
 +            ret = avformat_seek_file(is->ic, -1, seek_min, seek_target, seek_max, is->seek_flags);
 +            if (ret < 0) {
 +                fprintf(stderr, "%s: error while seeking\n", is->ic->filename);
 +            } else {
 +                if (is->audio_stream >= 0) {
 +                    packet_queue_flush(&is->audioq);
 +                    packet_queue_put(&is->audioq, &flush_pkt);
 +                }
 +                if (is->subtitle_stream >= 0) {
 +                    packet_queue_flush(&is->subtitleq);
 +                    packet_queue_put(&is->subtitleq, &flush_pkt);
 +                }
 +                if (is->video_stream >= 0) {
 +                    packet_queue_flush(&is->videoq);
 +                    packet_queue_put(&is->videoq, &flush_pkt);
 +                }
 +            }
 +            is->seek_req = 0;
 +            eof = 0;
 +        }
 +
 +        /* if the queue are full, no need to read more */
 +        if (   is->audioq.size + is->videoq.size + is->subtitleq.size > MAX_QUEUE_SIZE
 +            || (   (is->audioq   .nb_packets > MIN_FRAMES || is->audio_stream < 0)
 +                && (is->videoq   .nb_packets > MIN_FRAMES || is->video_stream < 0)
 +                && (is->subtitleq.nb_packets > MIN_FRAMES || is->subtitle_stream < 0))) {
 +            /* wait 10 ms */
 +            SDL_Delay(10);
 +            continue;
 +        }
 +        if (eof) {
 +            if (is->video_stream >= 0) {
 +                av_init_packet(pkt);
 +                pkt->data = NULL;
 +                pkt->size = 0;
 +                pkt->stream_index = is->video_stream;
 +                packet_queue_put(&is->videoq, pkt);
 +            }
 +            if (is->audio_stream >= 0 &&
 +                is->audio_st->codec->codec->capabilities & CODEC_CAP_DELAY) {
 +                av_init_packet(pkt);
 +                pkt->data = NULL;
 +                pkt->size = 0;
 +                pkt->stream_index = is->audio_stream;
 +                packet_queue_put(&is->audioq, pkt);
 +            }
 +            SDL_Delay(10);
 +            if (is->audioq.size + is->videoq.size + is->subtitleq.size == 0) {
 +                if (loop != 1 && (!loop || --loop)) {
 +                    stream_seek(is, start_time != AV_NOPTS_VALUE ? start_time : 0, 0, 0);
 +                } else if (autoexit) {
 +                    ret = AVERROR_EOF;
 +                    goto fail;
 +                }
 +            }
 +            eof=0;
 +            continue;
 +        }
 +        ret = av_read_frame(ic, pkt);
 +        if (ret < 0) {
 +            if (ret == AVERROR_EOF || url_feof(ic->pb))
 +                eof = 1;
 +            if (ic->pb && ic->pb->error)
 +                break;
 +            SDL_Delay(100); /* wait for user event */
 +            continue;
 +        }
 +        /* check if packet is in play range specified by user, then queue, otherwise discard */
 +        pkt_in_play_range = duration == AV_NOPTS_VALUE ||
 +                (pkt->pts - ic->streams[pkt->stream_index]->start_time) *
 +                av_q2d(ic->streams[pkt->stream_index]->time_base) -
 +                (double)(start_time != AV_NOPTS_VALUE ? start_time : 0) / 1000000
 +                <= ((double)duration / 1000000);
 +        if (pkt->stream_index == is->audio_stream && pkt_in_play_range) {
 +            packet_queue_put(&is->audioq, pkt);
 +        } else if (pkt->stream_index == is->video_stream && pkt_in_play_range) {
 +            packet_queue_put(&is->videoq, pkt);
 +        } else if (pkt->stream_index == is->subtitle_stream && pkt_in_play_range) {
 +            packet_queue_put(&is->subtitleq, pkt);
 +        } else {
 +            av_free_packet(pkt);
 +        }
 +    }
 +    /* wait until the end */
 +    while (!is->abort_request) {
 +        SDL_Delay(100);
 +    }
 +
 +    ret = 0;
 + fail:
 +    /* close each stream */
 +    if (is->audio_stream >= 0)
 +        stream_component_close(is, is->audio_stream);
 +    if (is->video_stream >= 0)
 +        stream_component_close(is, is->video_stream);
 +    if (is->subtitle_stream >= 0)
 +        stream_component_close(is, is->subtitle_stream);
 +    if (is->ic) {
 +        avformat_close_input(&is->ic);
 +    }
 +
 +    if (ret != 0) {
 +        SDL_Event event;
 +
 +        event.type = FF_QUIT_EVENT;
 +        event.user.data1 = is;
 +        SDL_PushEvent(&event);
 +    }
 +    return 0;
 +}
 +
 +static VideoState *stream_open(const char *filename, AVInputFormat *iformat)
 +{
 +    VideoState *is;
 +
 +    is = av_mallocz(sizeof(VideoState));
 +    if (!is)
 +        return NULL;
 +    av_strlcpy(is->filename, filename, sizeof(is->filename));
 +    is->iformat = iformat;
 +    is->ytop    = 0;
 +    is->xleft   = 0;
 +
 +    /* start video display */
 +    is->pictq_mutex = SDL_CreateMutex();
 +    is->pictq_cond  = SDL_CreateCond();
 +
 +    is->subpq_mutex = SDL_CreateMutex();
 +    is->subpq_cond  = SDL_CreateCond();
 +
 +    is->av_sync_type = av_sync_type;
 +    is->read_tid     = SDL_CreateThread(read_thread, is);
 +    if (!is->read_tid) {
 +        av_free(is);
 +        return NULL;
 +    }
 +    return is;
 +}
 +
 +static void stream_cycle_channel(VideoState *is, int codec_type)
 +{
 +    AVFormatContext *ic = is->ic;
 +    int start_index, stream_index;
 +    AVStream *st;
 +
 +    if (codec_type == AVMEDIA_TYPE_VIDEO)
 +        start_index = is->video_stream;
 +    else if (codec_type == AVMEDIA_TYPE_AUDIO)
 +        start_index = is->audio_stream;
 +    else
 +        start_index = is->subtitle_stream;
 +    if (start_index < (codec_type == AVMEDIA_TYPE_SUBTITLE ? -1 : 0))
 +        return;
 +    stream_index = start_index;
 +    for (;;) {
 +        if (++stream_index >= is->ic->nb_streams)
 +        {
 +            if (codec_type == AVMEDIA_TYPE_SUBTITLE)
 +            {
 +                stream_index = -1;
 +                goto the_end;
 +            } else
 +                stream_index = 0;
 +        }
 +        if (stream_index == start_index)
 +            return;
 +        st = ic->streams[stream_index];
 +        if (st->codec->codec_type == codec_type) {
 +            /* check that parameters are OK */
 +            switch (codec_type) {
 +            case AVMEDIA_TYPE_AUDIO:
 +                if (st->codec->sample_rate != 0 &&
 +                    st->codec->channels != 0)
 +                    goto the_end;
 +                break;
 +            case AVMEDIA_TYPE_VIDEO:
 +            case AVMEDIA_TYPE_SUBTITLE:
 +                goto the_end;
 +            default:
 +                break;
 +            }
 +        }
 +    }
 + the_end:
 +    stream_component_close(is, start_index);
 +    stream_component_open(is, stream_index);
 +}
 +
 +
 +static void toggle_full_screen(VideoState *is)
 +{
 +    av_unused int i;
 +    is_full_screen = !is_full_screen;
 +#if defined(__APPLE__) && SDL_VERSION_ATLEAST(1, 2, 14)
 +    /* OS X needs to reallocate the SDL overlays */
 +    for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
 +        is->pictq[i].reallocate = 1;
 +    }
 +#endif
 +    video_open(is, 1);
 +}
 +
 +static void toggle_pause(VideoState *is)
 +{
 +    stream_toggle_pause(is);
 +    is->step = 0;
 +}
 +
 +static void step_to_next_frame(VideoState *is)
 +{
 +    /* if the stream is paused unpause it, then step */
 +    if (is->paused)
 +        stream_toggle_pause(is);
 +    is->step = 1;
 +}
 +
 +static void toggle_audio_display(VideoState *is)
 +{
 +    int bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
 +    is->show_mode = (is->show_mode + 1) % SHOW_MODE_NB;
 +    fill_rectangle(screen,
 +                is->xleft, is->ytop, is->width, is->height,
 +                bgcolor);
 +    SDL_UpdateRect(screen, is->xleft, is->ytop, is->width, is->height);
 +}
 +
 +/* handle an event sent by the GUI */
 +static void event_loop(VideoState *cur_stream)
 +{
 +    SDL_Event event;
 +    double incr, pos, frac;
 +
 +    for (;;) {
 +        double x;
 +        SDL_WaitEvent(&event);
 +        switch (event.type) {
 +        case SDL_KEYDOWN:
 +            if (exit_on_keydown) {
 +                do_exit(cur_stream);
 +                break;
 +            }
 +            switch (event.key.keysym.sym) {
 +            case SDLK_ESCAPE:
 +            case SDLK_q:
 +                do_exit(cur_stream);
 +                break;
 +            case SDLK_f:
 +                toggle_full_screen(cur_stream);
 +                cur_stream->force_refresh = 1;
 +                break;
 +            case SDLK_p:
 +            case SDLK_SPACE:
 +                toggle_pause(cur_stream);
 +                break;
 +            case SDLK_s: // S: Step to next frame
 +                step_to_next_frame(cur_stream);
 +                break;
 +            case SDLK_a:
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_AUDIO);
 +                break;
 +            case SDLK_v:
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_VIDEO);
 +                break;
 +            case SDLK_t:
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_SUBTITLE);
 +                break;
 +            case SDLK_w:
 +                toggle_audio_display(cur_stream);
 +                cur_stream->force_refresh = 1;
 +                break;
 +            case SDLK_PAGEUP:
 +                incr = 600.0;
 +                goto do_seek;
 +            case SDLK_PAGEDOWN:
 +                incr = -600.0;
 +                goto do_seek;
 +            case SDLK_LEFT:
 +                incr = -10.0;
 +                goto do_seek;
 +            case SDLK_RIGHT:
 +                incr = 10.0;
 +                goto do_seek;
 +            case SDLK_UP:
 +                incr = 60.0;
 +                goto do_seek;
 +            case SDLK_DOWN:
 +                incr = -60.0;
 +            do_seek:
 +                    if (seek_by_bytes) {
 +                        if (cur_stream->video_stream >= 0 && cur_stream->video_current_pos >= 0) {
 +                            pos = cur_stream->video_current_pos;
 +                        } else if (cur_stream->audio_stream >= 0 && cur_stream->audio_pkt.pos >= 0) {
 +                            pos = cur_stream->audio_pkt.pos;
 +                        } else
 +                            pos = avio_tell(cur_stream->ic->pb);
 +                        if (cur_stream->ic->bit_rate)
 +                            incr *= cur_stream->ic->bit_rate / 8.0;
 +                        else
 +                            incr *= 180000.0;
 +                        pos += incr;
 +                        stream_seek(cur_stream, pos, incr, 1);
 +                    } else {
 +                        pos = get_master_clock(cur_stream);
 +                        pos += incr;
 +                        stream_seek(cur_stream, (int64_t)(pos * AV_TIME_BASE), (int64_t)(incr * AV_TIME_BASE), 0);
 +                    }
 +                break;
 +            default:
 +                break;
 +            }
 +            break;
 +        case SDL_VIDEOEXPOSE:
 +            cur_stream->force_refresh = 1;
 +            break;
 +        case SDL_MOUSEBUTTONDOWN:
 +            if (exit_on_mousedown) {
 +                do_exit(cur_stream);
 +                break;
 +            }
 +        case SDL_MOUSEMOTION:
 +            if (event.type == SDL_MOUSEBUTTONDOWN) {
 +                x = event.button.x;
 +            } else {
 +                if (event.motion.state != SDL_PRESSED)
 +                    break;
 +                x = event.motion.x;
 +            }
 +                if (seek_by_bytes || cur_stream->ic->duration <= 0) {
 +                    uint64_t size =  avio_size(cur_stream->ic->pb);
 +                    stream_seek(cur_stream, size*x/cur_stream->width, 0, 1);
 +                } else {
 +                    int64_t ts;
 +                    int ns, hh, mm, ss;
 +                    int tns, thh, tmm, tss;
 +                    tns  = cur_stream->ic->duration / 1000000LL;
 +                    thh  = tns / 3600;
 +                    tmm  = (tns % 3600) / 60;
 +                    tss  = (tns % 60);
 +                    frac = x / cur_stream->width;
 +                    ns   = frac * tns;
 +                    hh   = ns / 3600;
 +                    mm   = (ns % 3600) / 60;
 +                    ss   = (ns % 60);
 +                    fprintf(stderr, "Seek to %2.0f%% (%2d:%02d:%02d) of total duration (%2d:%02d:%02d)       \n", frac*100,
 +                            hh, mm, ss, thh, tmm, tss);
 +                    ts = frac * cur_stream->ic->duration;
 +                    if (cur_stream->ic->start_time != AV_NOPTS_VALUE)
 +                        ts += cur_stream->ic->start_time;
 +                    stream_seek(cur_stream, ts, 0, 0);
 +                }
 +            break;
 +        case SDL_VIDEORESIZE:
 +                screen = SDL_SetVideoMode(event.resize.w, event.resize.h, 0,
 +                                          SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_HWACCEL);
 +                screen_width  = cur_stream->width  = event.resize.w;
 +                screen_height = cur_stream->height = event.resize.h;
 +                cur_stream->force_refresh = 1;
 +            break;
 +        case SDL_QUIT:
 +        case FF_QUIT_EVENT:
 +            do_exit(cur_stream);
 +            break;
 +        case FF_ALLOC_EVENT:
 +            video_open(event.user.data1, 0);
 +            alloc_picture(event.user.data1);
 +            break;
 +        case FF_REFRESH_EVENT:
 +            video_refresh(event.user.data1);
 +            cur_stream->refresh = 0;
 +            break;
 +        default:
 +            break;
 +        }
 +    }
 +}
 +
 +static int opt_frame_size(const char *opt, const char *arg)
 +{
 +    av_log(NULL, AV_LOG_WARNING, "Option -s is deprecated, use -video_size.\n");
 +    return opt_default("video_size", arg);
 +}
 +
 +static int opt_width(const char *opt, const char *arg)
 +{
 +    screen_width = parse_number_or_die(opt, arg, OPT_INT64, 1, INT_MAX);
 +    return 0;
 +}
 +
 +static int opt_height(const char *opt, const char *arg)
 +{
 +    screen_height = parse_number_or_die(opt, arg, OPT_INT64, 1, INT_MAX);
 +    return 0;
 +}
 +
 +static int opt_format(const char *opt, const char *arg)
 +{
 +    file_iformat = av_find_input_format(arg);
 +    if (!file_iformat) {
 +        fprintf(stderr, "Unknown input format: %s\n", arg);
 +        return AVERROR(EINVAL);
 +    }
 +    return 0;
 +}
 +
 +static int opt_frame_pix_fmt(const char *opt, const char *arg)
 +{
 +    av_log(NULL, AV_LOG_WARNING, "Option -pix_fmt is deprecated, use -pixel_format.\n");
 +    return opt_default("pixel_format", arg);
 +}
 +
 +static int opt_sync(const char *opt, const char *arg)
 +{
 +    if (!strcmp(arg, "audio"))
 +        av_sync_type = AV_SYNC_AUDIO_MASTER;
 +    else if (!strcmp(arg, "video"))
 +        av_sync_type = AV_SYNC_VIDEO_MASTER;
 +    else if (!strcmp(arg, "ext"))
 +        av_sync_type = AV_SYNC_EXTERNAL_CLOCK;
 +    else {
 +        fprintf(stderr, "Unknown value for %s: %s\n", opt, arg);
 +        exit(1);
 +    }
 +    return 0;
 +}
 +
 +static int opt_seek(const char *opt, const char *arg)
 +{
 +    start_time = parse_time_or_die(opt, arg, 1);
 +    return 0;
 +}
 +
 +static int opt_duration(const char *opt, const char *arg)
 +{
 +    duration = parse_time_or_die(opt, arg, 1);
 +    return 0;
 +}
 +
 +static int opt_show_mode(const char *opt, const char *arg)
 +{
 +    show_mode = !strcmp(arg, "video") ? SHOW_MODE_VIDEO :
 +                !strcmp(arg, "waves") ? SHOW_MODE_WAVES :
 +                !strcmp(arg, "rdft" ) ? SHOW_MODE_RDFT  :
 +                parse_number_or_die(opt, arg, OPT_INT, 0, SHOW_MODE_NB-1);
 +    return 0;
 +}
 +
 +static void opt_input_file(void *optctx, const char *filename)
 +{
 +    if (input_filename) {
 +        fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n",
 +                filename, input_filename);
 +        exit_program(1);
 +    }
 +    if (!strcmp(filename, "-"))
 +        filename = "pipe:";
 +    input_filename = filename;
 +}
 +
 +static int opt_codec(void *o, const char *opt, const char *arg)
 +{
 +    switch(opt[strlen(opt)-1]){
 +    case 'a' :    audio_codec_name = arg; break;
 +    case 's' : subtitle_codec_name = arg; break;
 +    case 'v' :    video_codec_name = arg; break;
 +    }
 +    return 0;
 +}
 +
 +static int dummy;
 +
 +static const OptionDef options[] = {
 +#include "cmdutils_common_opts.h"
 +    { "x", HAS_ARG, { (void*)opt_width }, "force displayed width", "width" },
 +    { "y", HAS_ARG, { (void*)opt_height }, "force displayed height", "height" },
 +    { "s", HAS_ARG | OPT_VIDEO, { (void*)opt_frame_size }, "set frame size (WxH or abbreviation)", "size" },
 +    { "fs", OPT_BOOL, { (void*)&is_full_screen }, "force full screen" },
 +    { "an", OPT_BOOL, { (void*)&audio_disable }, "disable audio" },
 +    { "vn", OPT_BOOL, { (void*)&video_disable }, "disable video" },
 +    { "ast", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&wanted_stream[AVMEDIA_TYPE_AUDIO] }, "select desired audio stream", "stream_number" },
 +    { "vst", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&wanted_stream[AVMEDIA_TYPE_VIDEO] }, "select desired video stream", "stream_number" },
 +    { "sst", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&wanted_stream[AVMEDIA_TYPE_SUBTITLE] }, "select desired subtitle stream", "stream_number" },
 +    { "ss", HAS_ARG, { (void*)&opt_seek }, "seek to a given position in seconds", "pos" },
 +    { "t", HAS_ARG, { (void*)&opt_duration }, "play  \"duration\" seconds of audio/video", "duration" },
 +    { "bytes", OPT_INT | HAS_ARG, { (void*)&seek_by_bytes }, "seek by bytes 0=off 1=on -1=auto", "val" },
 +    { "nodisp", OPT_BOOL, { (void*)&display_disable }, "disable graphical display" },
 +    { "f", HAS_ARG, { (void*)opt_format }, "force format", "fmt" },
 +    { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, { (void*)opt_frame_pix_fmt }, "set pixel format", "format" },
 +    { "stats", OPT_BOOL | OPT_EXPERT, { (void*)&show_status }, "show status", "" },
 +    { "bug", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&workaround_bugs }, "workaround bugs", "" },
 +    { "fast", OPT_BOOL | OPT_EXPERT, { (void*)&fast }, "non spec compliant optimizations", "" },
 +    { "genpts", OPT_BOOL | OPT_EXPERT, { (void*)&genpts }, "generate pts", "" },
 +    { "drp", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&decoder_reorder_pts }, "let decoder reorder pts 0=off 1=on -1=auto", ""},
 +    { "skiploop", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_loop_filter }, "", "" },
 +    { "skipframe", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_frame }, "", "" },
 +    { "skipidct", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&skip_idct }, "", "" },
 +    { "idct", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&idct }, "set idct algo",  "algo" },
 +    { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&error_concealment }, "set error concealment options",  "bit_mask" },
 +    { "sync", HAS_ARG | OPT_EXPERT, { (void*)opt_sync }, "set audio-video sync. type (type=audio/video/ext)", "type" },
 +    { "autoexit", OPT_BOOL | OPT_EXPERT, { (void*)&autoexit }, "exit at the end", "" },
 +    { "exitonkeydown", OPT_BOOL | OPT_EXPERT, { (void*)&exit_on_keydown }, "exit on key down", "" },
 +    { "exitonmousedown", OPT_BOOL | OPT_EXPERT, { (void*)&exit_on_mousedown }, "exit on mouse down", "" },
 +    { "loop", OPT_INT | HAS_ARG | OPT_EXPERT, { (void*)&loop }, "set number of times the playback shall be looped", "loop count" },
 +    { "framedrop", OPT_BOOL | OPT_EXPERT, { (void*)&framedrop }, "drop frames when cpu is too slow", "" },
 +    { "window_title", OPT_STRING | HAS_ARG, { (void*)&window_title }, "set window title", "window title" },
 +#if CONFIG_AVFILTER
 +    { "vf", OPT_STRING | HAS_ARG, { (void*)&vfilters }, "video filters", "filter list" },
 +#endif
 +    { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, { (void*)&rdftspeed }, "rdft speed", "msecs" },
 +    { "showmode", HAS_ARG, {(void*)opt_show_mode}, "select show mode (0 = video, 1 = waves, 2 = RDFT)", "mode" },
 +    { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, { (void*)opt_default }, "generic catch all option", "" },
 +    { "i", OPT_BOOL, {(void *)&dummy}, "read specified file", "input_file"},
 +    { "codec", HAS_ARG | OPT_FUNC2, {(void*)opt_codec}, "force decoder", "decoder" },
 +    { NULL, },
 +};
 +
 +static void show_usage(void)
 +{
 +    av_log(NULL, AV_LOG_INFO, "Simple media player\n");
 +    av_log(NULL, AV_LOG_INFO, "usage: %s [options] input_file\n", program_name);
 +    av_log(NULL, AV_LOG_INFO, "\n");
 +}
 +
 +static int opt_help(const char *opt, const char *arg)
 +{
 +    av_log_set_callback(log_callback_help);
 +    show_usage();
 +    show_help_options(options, "Main options:\n",
 +                      OPT_EXPERT, 0);
 +    show_help_options(options, "\nAdvanced options:\n",
 +                      OPT_EXPERT, OPT_EXPERT);
 +    printf("\n");
 +    show_help_children(avcodec_get_class(), AV_OPT_FLAG_DECODING_PARAM);
 +    show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM);
 +#if !CONFIG_AVFILTER
 +    show_help_children(sws_get_class(), AV_OPT_FLAG_ENCODING_PARAM);
 +#endif
 +    printf("\nWhile playing:\n"
 +           "q, ESC              quit\n"
 +           "f                   toggle full screen\n"
 +           "p, SPC              pause\n"
 +           "a                   cycle audio channel\n"
 +           "v                   cycle video channel\n"
 +           "t                   cycle subtitle channel\n"
 +           "w                   show audio waves\n"
 +           "s                   activate frame-step mode\n"
 +           "left/right          seek backward/forward 10 seconds\n"
 +           "down/up             seek backward/forward 1 minute\n"
 +           "page down/page up   seek backward/forward 10 minutes\n"
 +           "mouse click         seek to percentage in file corresponding to fraction of width\n"
 +           );
 +    return 0;
 +}
 +
 +static int lockmgr(void **mtx, enum AVLockOp op)
 +{
 +   switch(op) {
 +      case AV_LOCK_CREATE:
 +          *mtx = SDL_CreateMutex();
 +          if(!*mtx)
 +              return 1;
 +          return 0;
 +      case AV_LOCK_OBTAIN:
 +          return !!SDL_LockMutex(*mtx);
 +      case AV_LOCK_RELEASE:
 +          return !!SDL_UnlockMutex(*mtx);
 +      case AV_LOCK_DESTROY:
 +          SDL_DestroyMutex(*mtx);
 +          return 0;
 +   }
 +   return 1;
 +}
 +
 +/* Called from the main */
 +int main(int argc, char **argv)
 +{
 +    int flags;
 +    VideoState *is;
 +
 +    av_log_set_flags(AV_LOG_SKIP_REPEATED);
 +    parse_loglevel(argc, argv, options);
 +
 +    /* register all codecs, demux and protocols */
 +    avcodec_register_all();
 +#if CONFIG_AVDEVICE
 +    avdevice_register_all();
 +#endif
 +#if CONFIG_AVFILTER
 +    avfilter_register_all();
 +#endif
 +    av_register_all();
 +    avformat_network_init();
 +
 +    init_opts();
 +
 +    signal(SIGINT , sigterm_handler); /* Interrupt (ANSI).    */
 +    signal(SIGTERM, sigterm_handler); /* Termination (ANSI).  */
 +
 +    show_banner(argc, argv, options);
 +
 +    parse_options(NULL, argc, argv, options, opt_input_file);
 +
 +    if (!input_filename) {
 +        show_usage();
 +        fprintf(stderr, "An input file must be specified\n");
 +        fprintf(stderr, "Use -h to get full help or, even better, run 'man %s'\n", program_name);
 +        exit(1);
 +    }
 +
 +    if (display_disable) {
 +        video_disable = 1;
 +    }
 +    flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
 +    if (audio_disable)
 +        flags &= ~SDL_INIT_AUDIO;
 +#if !defined(__MINGW32__) && !defined(__APPLE__)
 +    flags |= SDL_INIT_EVENTTHREAD; /* Not supported on Windows or Mac OS X */
 +#endif
 +    if (SDL_Init (flags)) {
 +        fprintf(stderr, "Could not initialize SDL - %s\n", SDL_GetError());
 +        fprintf(stderr, "(Did you set the DISPLAY variable?)\n");
 +        exit(1);
 +    }
 +
 +    if (!display_disable) {
 +#if HAVE_SDL_VIDEO_SIZE
 +        const SDL_VideoInfo *vi = SDL_GetVideoInfo();
 +        fs_screen_width = vi->current_w;
 +        fs_screen_height = vi->current_h;
 +#endif
 +    }
 +
 +    SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);
 +    SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE);
 +    SDL_EventState(SDL_USEREVENT, SDL_IGNORE);
 +
 +    if (av_lockmgr_register(lockmgr)) {
 +        fprintf(stderr, "Could not initialize lock manager!\n");
 +        do_exit(NULL);
 +    }
 +
 +    av_init_packet(&flush_pkt);
 +    flush_pkt.data = (char *)(intptr_t)"FLUSH";
 +
 +    is = stream_open(input_filename, file_iformat);
 +    if (!is) {
 +        fprintf(stderr, "Failed to initialize VideoState!\n");
 +        do_exit(NULL);
 +    }
 +
 +    event_loop(is);
 +
 +    /* never returns */
 +
 +    return 0;
 +}
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
   */
  
  #include <stdint.h>
+ #include "libavutil/arm/cpu.h"
  #include "libavcodec/vp8dsp.h"
  
 -void ff_vp8_luma_dc_wht_neon(DCTELEM block[4][4][16], DCTELEM dc[16]);
 -void ff_vp8_luma_dc_wht_dc_neon(DCTELEM block[4][4][16], DCTELEM dc[16]);
 +void ff_vp8_luma_dc_wht_dc_armv6(DCTELEM block[4][4][16], DCTELEM dc[16]);
  
 -void ff_vp8_idct_add_neon(uint8_t *dst, DCTELEM block[16], ptrdiff_t stride);
 -void ff_vp8_idct_dc_add_neon(uint8_t *dst, DCTELEM block[16], ptrdiff_t stride);
 -void ff_vp8_idct_dc_add4y_neon(uint8_t *dst, DCTELEM block[4][16], ptrdiff_t stride);
 -void ff_vp8_idct_dc_add4uv_neon(uint8_t *dst, DCTELEM block[4][16], ptrdiff_t stride);
 +#define idct_funcs(opt) \
 +void ff_vp8_luma_dc_wht_ ## opt(DCTELEM block[4][4][16], DCTELEM dc[16]); \
 +void ff_vp8_idct_add_ ## opt(uint8_t *dst, DCTELEM block[16], ptrdiff_t stride); \
 +void ff_vp8_idct_dc_add_ ## opt(uint8_t *dst, DCTELEM block[16], ptrdiff_t stride); \
 +void ff_vp8_idct_dc_add4y_ ## opt(uint8_t *dst, DCTELEM block[4][16], ptrdiff_t stride); \
 +void ff_vp8_idct_dc_add4uv_ ## opt(uint8_t *dst, DCTELEM block[4][16], ptrdiff_t stride)
 +
 +idct_funcs(neon);
 +idct_funcs(armv6);
  
  void ff_vp8_v_loop_filter16_neon(uint8_t *dst, ptrdiff_t stride,
                                   int flim_E, int flim_I, int hev_thresh);
@@@ -162,148 -83,85 +164,150 @@@ VP8_MC(bilin4_h)
  VP8_MC(bilin4_v);
  VP8_MC(bilin4_hv);
  
 +#define VP8_V6_MC(n) \
 +void ff_put_vp8_##n##_armv6(uint8_t *dst, int dststride, uint8_t *src, \
 +                            int srcstride, int w, int h, int mxy)
 +
 +VP8_V6_MC(epel_v6);
 +VP8_V6_MC(epel_h6);
 +VP8_V6_MC(epel_v4);
 +VP8_V6_MC(epel_h4);
 +VP8_V6_MC(bilin_v);
 +VP8_V6_MC(bilin_h);
 +
 +#define VP8_EPEL_HV(SIZE, TAPNUMX, TAPNUMY, NAME, HNAME, VNAME, MAXHEIGHT) \
 +static void ff_put_vp8_##NAME##SIZE##_##HNAME##VNAME##_armv6( \
 +                                        uint8_t *dst, int dststride, uint8_t *src, \
 +                                        int srcstride, int h, int mx, int my) \
 +{ \
 +    DECLARE_ALIGNED(4, uint8_t, tmp)[SIZE * (MAXHEIGHT + TAPNUMY - 1)]; \
 +    uint8_t *tmpptr = tmp + SIZE * (TAPNUMY / 2 - 1); \
 +    src -= srcstride * (TAPNUMY / 2 - 1); \
 +    ff_put_vp8_ ## NAME ## _ ## HNAME ## _armv6(tmp, SIZE,      src,    srcstride, \
 +                                                SIZE, h + TAPNUMY - 1,  mx); \
 +    ff_put_vp8_ ## NAME ## _ ## VNAME ## _armv6(dst, dststride, tmpptr, SIZE, \
 +                                                SIZE, h,                my); \
 +}
 +
 +VP8_EPEL_HV(16, 6, 6, epel,  h6, v6, 16);
 +VP8_EPEL_HV(16, 2, 2, bilin, h,  v,  16);
 +VP8_EPEL_HV(8,  6, 6, epel,  h6, v6, 16);
 +VP8_EPEL_HV(8,  4, 6, epel,  h4, v6, 16);
 +VP8_EPEL_HV(8,  6, 4, epel,  h6, v4, 16);
 +VP8_EPEL_HV(8,  4, 4, epel,  h4, v4, 16);
 +VP8_EPEL_HV(8,  2, 2, bilin, h,  v,  16);
 +VP8_EPEL_HV(4,  6, 6, epel,  h6, v6, 8);
 +VP8_EPEL_HV(4,  4, 6, epel,  h4, v6, 8);
 +VP8_EPEL_HV(4,  6, 4, epel,  h6, v4, 8);
 +VP8_EPEL_HV(4,  4, 4, epel,  h4, v4, 8);
 +VP8_EPEL_HV(4,  2, 2, bilin, h,  v,  8);
 +
 +extern void put_vp8_epel4_v6_c(uint8_t *dst, int d, uint8_t *src, int s, int h, int mx, int my);
 +#undef printf
 +#define VP8_EPEL_H_OR_V(SIZE, NAME, HV) \
 +static void ff_put_vp8_##NAME##SIZE##_##HV##_armv6( \
 +                                        uint8_t *dst, int dststride, uint8_t *src, \
 +                                        int srcstride, int h, int mx, int my) \
 +{ \
 +    ff_put_vp8_## NAME ## _ ## HV ## _armv6(dst, dststride, src, srcstride, \
 +                                            SIZE, h, mx | my); \
 +}
 +
 +VP8_EPEL_H_OR_V(4,  epel,  h6);
 +VP8_EPEL_H_OR_V(4,  epel,  h4);
 +VP8_EPEL_H_OR_V(4,  epel,  v6);
 +VP8_EPEL_H_OR_V(4,  epel,  v4);
 +VP8_EPEL_H_OR_V(4,  bilin, v);
 +VP8_EPEL_H_OR_V(4,  bilin, h);
 +VP8_EPEL_H_OR_V(8,  epel,  h6);
 +VP8_EPEL_H_OR_V(8,  epel,  h4);
 +VP8_EPEL_H_OR_V(8,  epel,  v6);
 +VP8_EPEL_H_OR_V(8,  epel,  v4);
 +VP8_EPEL_H_OR_V(8,  bilin, v);
 +VP8_EPEL_H_OR_V(8,  bilin, h);
 +VP8_EPEL_H_OR_V(16, epel,  h6);
 +VP8_EPEL_H_OR_V(16, epel,  v6);
 +VP8_EPEL_H_OR_V(16, bilin, v);
 +VP8_EPEL_H_OR_V(16, bilin, h);
 +
  av_cold void ff_vp8dsp_init_arm(VP8DSPContext *dsp)
  {
-     if (HAVE_NEON) {
 +#define set_func_ptrs(opt) \
 +        dsp->vp8_luma_dc_wht    = ff_vp8_luma_dc_wht_##opt; \
 +        dsp->vp8_luma_dc_wht_dc = ff_vp8_luma_dc_wht_dc_armv6; \
 + \
 +        dsp->vp8_idct_add       = ff_vp8_idct_add_##opt; \
 +        dsp->vp8_idct_dc_add    = ff_vp8_idct_dc_add_##opt; \
 +        dsp->vp8_idct_dc_add4y  = ff_vp8_idct_dc_add4y_##opt; \
 +        dsp->vp8_idct_dc_add4uv = ff_vp8_idct_dc_add4uv_##opt; \
 + \
 +        dsp->vp8_v_loop_filter16y = ff_vp8_v_loop_filter16_##opt; \
 +        dsp->vp8_h_loop_filter16y = ff_vp8_h_loop_filter16_##opt; \
 +        dsp->vp8_v_loop_filter8uv = ff_vp8_v_loop_filter8uv_##opt; \
 +        dsp->vp8_h_loop_filter8uv = ff_vp8_h_loop_filter8uv_##opt; \
 + \
 +        dsp->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16_inner_##opt; \
 +        dsp->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16_inner_##opt; \
 +        dsp->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_##opt; \
 +        dsp->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_##opt; \
 + \
 +        dsp->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter16_simple_##opt; \
 +        dsp->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_##opt; \
 + \
 +        dsp->put_vp8_epel_pixels_tab[0][0][0] = ff_put_vp8_pixels16_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[0][0][2] = ff_put_vp8_epel16_h6_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[0][2][0] = ff_put_vp8_epel16_v6_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[0][2][2] = ff_put_vp8_epel16_h6v6_##opt; \
 + \
 +        dsp->put_vp8_epel_pixels_tab[1][0][0] = ff_put_vp8_pixels8_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[1][0][1] = ff_put_vp8_epel8_h4_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[1][0][2] = ff_put_vp8_epel8_h6_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[1][1][0] = ff_put_vp8_epel8_v4_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[1][1][1] = ff_put_vp8_epel8_h4v4_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[1][1][2] = ff_put_vp8_epel8_h6v4_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[1][2][0] = ff_put_vp8_epel8_v6_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[1][2][1] = ff_put_vp8_epel8_h4v6_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[1][2][2] = ff_put_vp8_epel8_h6v6_##opt; \
 + \
 +        dsp->put_vp8_epel_pixels_tab[2][0][0] = ff_put_vp8_pixels4_armv6; \
 +        dsp->put_vp8_epel_pixels_tab[2][0][1] = ff_put_vp8_epel4_h4_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[2][0][2] = ff_put_vp8_epel4_h6_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[2][1][0] = ff_put_vp8_epel4_v4_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[2][1][1] = ff_put_vp8_epel4_h4v4_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[2][1][2] = ff_put_vp8_epel4_h6v4_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[2][2][0] = ff_put_vp8_epel4_v6_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[2][2][1] = ff_put_vp8_epel4_h4v6_##opt; \
 +        dsp->put_vp8_epel_pixels_tab[2][2][2] = ff_put_vp8_epel4_h6v6_##opt; \
 + \
 +        dsp->put_vp8_bilinear_pixels_tab[0][0][0] = ff_put_vp8_pixels16_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[0][0][2] = ff_put_vp8_bilin16_h_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[0][2][0] = ff_put_vp8_bilin16_v_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[0][2][2] = ff_put_vp8_bilin16_hv_##opt; \
 + \
 +        dsp->put_vp8_bilinear_pixels_tab[1][0][0] = ff_put_vp8_pixels8_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[1][0][1] = ff_put_vp8_bilin8_h_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[1][0][2] = ff_put_vp8_bilin8_h_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[1][1][0] = ff_put_vp8_bilin8_v_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[1][1][1] = ff_put_vp8_bilin8_hv_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[1][1][2] = ff_put_vp8_bilin8_hv_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[1][2][0] = ff_put_vp8_bilin8_v_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[1][2][1] = ff_put_vp8_bilin8_hv_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[1][2][2] = ff_put_vp8_bilin8_hv_##opt; \
 + \
 +        dsp->put_vp8_bilinear_pixels_tab[2][0][0] = ff_put_vp8_pixels4_armv6; \
 +        dsp->put_vp8_bilinear_pixels_tab[2][0][1] = ff_put_vp8_bilin4_h_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[2][0][2] = ff_put_vp8_bilin4_h_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[2][1][0] = ff_put_vp8_bilin4_v_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[2][1][1] = ff_put_vp8_bilin4_hv_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[2][1][2] = ff_put_vp8_bilin4_hv_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[2][2][0] = ff_put_vp8_bilin4_v_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[2][2][1] = ff_put_vp8_bilin4_hv_##opt; \
 +        dsp->put_vp8_bilinear_pixels_tab[2][2][2] = ff_put_vp8_bilin4_hv_##opt
 -        dsp->vp8_luma_dc_wht    = ff_vp8_luma_dc_wht_neon;
 -        dsp->vp8_luma_dc_wht_dc = ff_vp8_luma_dc_wht_dc_neon;
 -
 -        dsp->vp8_idct_add       = ff_vp8_idct_add_neon;
 -        dsp->vp8_idct_dc_add    = ff_vp8_idct_dc_add_neon;
 -        dsp->vp8_idct_dc_add4y  = ff_vp8_idct_dc_add4y_neon;
 -        dsp->vp8_idct_dc_add4uv = ff_vp8_idct_dc_add4uv_neon;
 -
 -        dsp->vp8_v_loop_filter16y = ff_vp8_v_loop_filter16_neon;
 -        dsp->vp8_h_loop_filter16y = ff_vp8_h_loop_filter16_neon;
 -        dsp->vp8_v_loop_filter8uv = ff_vp8_v_loop_filter8uv_neon;
 -        dsp->vp8_h_loop_filter8uv = ff_vp8_h_loop_filter8uv_neon;
 -
 -        dsp->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16_inner_neon;
 -        dsp->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16_inner_neon;
 -        dsp->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_neon;
 -        dsp->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_neon;
 -
 -        dsp->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter16_simple_neon;
 -        dsp->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_neon;
 -
 -        dsp->put_vp8_epel_pixels_tab[0][0][0] = ff_put_vp8_pixels16_neon;
 -        dsp->put_vp8_epel_pixels_tab[0][0][2] = ff_put_vp8_epel16_h6_neon;
 -        dsp->put_vp8_epel_pixels_tab[0][2][0] = ff_put_vp8_epel16_v6_neon;
 -        dsp->put_vp8_epel_pixels_tab[0][2][2] = ff_put_vp8_epel16_h6v6_neon;
 -
 -        dsp->put_vp8_epel_pixels_tab[1][0][0] = ff_put_vp8_pixels8_neon;
 -        dsp->put_vp8_epel_pixels_tab[1][0][1] = ff_put_vp8_epel8_h4_neon;
 -        dsp->put_vp8_epel_pixels_tab[1][0][2] = ff_put_vp8_epel8_h6_neon;
 -        dsp->put_vp8_epel_pixels_tab[1][1][0] = ff_put_vp8_epel8_v4_neon;
 -        dsp->put_vp8_epel_pixels_tab[1][1][1] = ff_put_vp8_epel8_h4v4_neon;
 -        dsp->put_vp8_epel_pixels_tab[1][1][2] = ff_put_vp8_epel8_h6v4_neon;
 -        dsp->put_vp8_epel_pixels_tab[1][2][0] = ff_put_vp8_epel8_v6_neon;
 -        dsp->put_vp8_epel_pixels_tab[1][2][1] = ff_put_vp8_epel8_h4v6_neon;
 -        dsp->put_vp8_epel_pixels_tab[1][2][2] = ff_put_vp8_epel8_h6v6_neon;
 -
 -        dsp->put_vp8_epel_pixels_tab[2][0][0] = ff_put_vp8_pixels4_neon;
 -        dsp->put_vp8_epel_pixels_tab[2][0][1] = ff_put_vp8_epel4_h4_neon;
 -        dsp->put_vp8_epel_pixels_tab[2][0][2] = ff_put_vp8_epel4_h6_neon;
 -        dsp->put_vp8_epel_pixels_tab[2][1][0] = ff_put_vp8_epel4_v4_neon;
 -        dsp->put_vp8_epel_pixels_tab[2][1][1] = ff_put_vp8_epel4_h4v4_neon;
 -        dsp->put_vp8_epel_pixels_tab[2][1][2] = ff_put_vp8_epel4_h6v4_neon;
 -        dsp->put_vp8_epel_pixels_tab[2][2][0] = ff_put_vp8_epel4_v6_neon;
 -        dsp->put_vp8_epel_pixels_tab[2][2][1] = ff_put_vp8_epel4_h4v6_neon;
 -        dsp->put_vp8_epel_pixels_tab[2][2][2] = ff_put_vp8_epel4_h6v6_neon;
 -
 -        dsp->put_vp8_bilinear_pixels_tab[0][0][0] = ff_put_vp8_pixels16_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[0][0][1] = ff_put_vp8_bilin16_h_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[0][0][2] = ff_put_vp8_bilin16_h_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[0][1][0] = ff_put_vp8_bilin16_v_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[0][1][1] = ff_put_vp8_bilin16_hv_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[0][1][2] = ff_put_vp8_bilin16_hv_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[0][2][0] = ff_put_vp8_bilin16_v_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[0][2][1] = ff_put_vp8_bilin16_hv_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[0][2][2] = ff_put_vp8_bilin16_hv_neon;
 -
 -        dsp->put_vp8_bilinear_pixels_tab[1][0][0] = ff_put_vp8_pixels8_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[1][0][1] = ff_put_vp8_bilin8_h_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[1][0][2] = ff_put_vp8_bilin8_h_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[1][1][0] = ff_put_vp8_bilin8_v_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[1][1][1] = ff_put_vp8_bilin8_hv_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[1][1][2] = ff_put_vp8_bilin8_hv_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[1][2][0] = ff_put_vp8_bilin8_v_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[1][2][1] = ff_put_vp8_bilin8_hv_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[1][2][2] = ff_put_vp8_bilin8_hv_neon;
 -
 -        dsp->put_vp8_bilinear_pixels_tab[2][0][0] = ff_put_vp8_pixels4_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[2][0][1] = ff_put_vp8_bilin4_h_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[2][0][2] = ff_put_vp8_bilin4_h_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[2][1][0] = ff_put_vp8_bilin4_v_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[2][1][1] = ff_put_vp8_bilin4_hv_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[2][1][2] = ff_put_vp8_bilin4_hv_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[2][2][0] = ff_put_vp8_bilin4_v_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[2][2][1] = ff_put_vp8_bilin4_hv_neon;
 -        dsp->put_vp8_bilinear_pixels_tab[2][2][2] = ff_put_vp8_bilin4_hv_neon;
+     int cpu_flags = av_get_cpu_flags();
+     if (have_neon(cpu_flags)) {
 +        set_func_ptrs(neon);
 +    } else if (HAVE_ARMV6) {
 +        set_func_ptrs(armv6);
      }
  }
Simple merge
Simple merge
Simple merge
diff --cc libavcodec/dv.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 4e8c5da,0000000..5b09b34
mode 100644,000000..100644
--- /dev/null
@@@ -1,374 -1,0 +1,373 @@@
-     ctx->dec_params.cp_reduce = avctx->lowres;
 +/*
 + * JPEG 2000 decoding support via OpenJPEG
 + * Copyright (c) 2009 Jaikrishnan Menon <realityman@gmx.net>
 + *
 + * 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
 +* JPEG 2000 decoder using libopenjpeg
 +*/
 +
 +#include "libavutil/imgutils.h"
 +#include "libavutil/pixfmt.h"
 +#include "avcodec.h"
 +#include "libavutil/intreadwrite.h"
 +#include "thread.h"
 +#define  OPJ_STATIC
 +#include <openjpeg.h>
 +
 +#define JP2_SIG_TYPE    0x6A502020
 +#define JP2_SIG_VALUE   0x0D0A870A
 +
 +typedef struct {
 +    opj_dparameters_t dec_params;
 +    AVFrame image;
 +} LibOpenJPEGContext;
 +
 +static enum PixelFormat check_image_attributes(AVCodecContext *avctx, opj_image_t *image)
 +{
 +    opj_image_comp_t c0 = image->comps[0];
 +    opj_image_comp_t c1 = image->comps[1];
 +    opj_image_comp_t c2 = image->comps[2];
 +    int compRatio = 0;
 +    compRatio |= c0.dx << 15 | c0.dy << 12;
 +    compRatio |= c1.dx << 9  | c1.dy << 6;
 +    compRatio |= c2.dx << 3  | c2.dy;
 +
 +    if (image->numcomps == 4) {
 +        if (c0.prec == 8) {
 +            if (compRatio == 0112222 &&
 +                image->comps[3].dx == 1 && image->comps[3].dy == 1) {
 +                return PIX_FMT_YUVA420P;
 +            } else {
 +                return PIX_FMT_RGBA;
 +            }
 +        } else {
 +            return PIX_FMT_RGBA64;
 +        }
 +    }
 +
 +    switch (compRatio) {
 +    case 0111111: goto libopenjpeg_yuv444_rgb;
 +    case 0111212: return PIX_FMT_YUV440P;
 +    case 0112121: goto libopenjpeg_yuv422;
 +    case 0112222: goto libopenjpeg_yuv420;
 +    default: goto libopenjpeg_rgb;
 +    }
 +
 +libopenjpeg_yuv420:
 +    switch (c0.prec) {
 +    case 8:  return PIX_FMT_YUV420P;
 +    case 9:  return PIX_FMT_YUV420P9;
 +    case 10: return PIX_FMT_YUV420P10;
 +    case 16: return PIX_FMT_YUV420P16;
 +    }
 +
 +libopenjpeg_yuv422:
 +    switch (c0.prec) {
 +    case 8:  return PIX_FMT_YUV422P;
 +    case 9:  return PIX_FMT_YUV422P9;
 +    case 10: return PIX_FMT_YUV422P10;
 +    case 16: return PIX_FMT_YUV422P16;
 +    }
 +
 +libopenjpeg_yuv444_rgb:
 +    switch (c0.prec) {
 +    case 8:  return PIX_FMT_RGB24;
 +    case 9:  return PIX_FMT_YUV444P9;
 +    case 10: return PIX_FMT_YUV444P10;
 +    case 16: return PIX_FMT_YUV444P16;
 +    }
 +
 +libopenjpeg_rgb:
 +    switch (c0.prec) {
 +    case 8: return PIX_FMT_RGB24;
 +    default: return PIX_FMT_RGB48;
 +    }
 +
 +    return PIX_FMT_RGB24;
 +}
 +
 +static inline int libopenjpeg_ispacked(enum PixelFormat pix_fmt) {
 +    int i, component_plane;
 +
 +    if (pix_fmt == PIX_FMT_GRAY16)
 +        return 0;
 +
 +    component_plane = av_pix_fmt_descriptors[pix_fmt].comp[0].plane;
 +    for(i = 1; i < av_pix_fmt_descriptors[pix_fmt].nb_components; i++) {
 +        if (component_plane != av_pix_fmt_descriptors[pix_fmt].comp[i].plane)
 +            return 0;
 +    }
 +    return 1;
 +}
 +
 +static inline void libopenjpeg_copy_to_packed8(AVFrame *picture, opj_image_t *image) {
 +    uint8_t *img_ptr;
 +    int index, x, y, c;
 +    for(y = 0; y < picture->height; y++) {
 +        index = y*picture->width;
 +        img_ptr = picture->data[0] + y*picture->linesize[0];
 +        for(x = 0; x < picture->width; x++, index++) {
 +            for(c = 0; c < image->numcomps; c++) {
 +                *img_ptr++ = image->comps[c].data[index];
 +            }
 +        }
 +    }
 +}
 +
 +static inline void libopenjpeg_copy_to_packed16(AVFrame *picture, opj_image_t *image) {
 +    uint16_t *img_ptr;
 +    int index, x, y, c;
 +    int adjust[4];
 +    for (x = 0; x < image->numcomps; x++) {
 +        adjust[x] = FFMAX(FFMIN(16 - image->comps[x].prec, 8), 0);
 +    }
 +    for (y = 0; y < picture->height; y++) {
 +        index = y*picture->width;
 +        img_ptr = (uint16_t*) (picture->data[0] + y*picture->linesize[0]);
 +        for (x = 0; x < picture->width; x++, index++) {
 +            for (c = 0; c < image->numcomps; c++) {
 +                *img_ptr++ = image->comps[c].data[index] << adjust[c];
 +            }
 +        }
 +    }
 +}
 +
 +static inline void libopenjpeg_copyto8(AVFrame *picture, opj_image_t *image) {
 +    int *comp_data;
 +    uint8_t *img_ptr;
 +    int index, x, y;
 +
 +    for(index = 0; index < image->numcomps; index++) {
 +        comp_data = image->comps[index].data;
 +        for(y = 0; y < image->comps[index].h; y++) {
 +            img_ptr = picture->data[index] + y * picture->linesize[index];
 +            for(x = 0; x < image->comps[index].w; x++) {
 +                *img_ptr = (uint8_t) *comp_data;
 +                img_ptr++;
 +                comp_data++;
 +            }
 +        }
 +    }
 +}
 +
 +static inline void libopenjpeg_copyto16(AVFrame *picture, opj_image_t *image) {
 +    int *comp_data;
 +    uint16_t *img_ptr;
 +    int index, x, y;
 +    for(index = 0; index < image->numcomps; index++) {
 +        comp_data = image->comps[index].data;
 +        for(y = 0; y < image->comps[index].h; y++) {
 +            img_ptr = (uint16_t*) (picture->data[index] + y * picture->linesize[index]);
 +            for(x = 0; x < image->comps[index].w; x++) {
 +                *img_ptr = *comp_data;
 +                img_ptr++;
 +                comp_data++;
 +            }
 +        }
 +    }
 +}
 +
 +static av_cold int libopenjpeg_decode_init(AVCodecContext *avctx)
 +{
 +    LibOpenJPEGContext *ctx = avctx->priv_data;
 +
 +    opj_set_default_decoder_parameters(&ctx->dec_params);
 +    avcodec_get_frame_defaults(&ctx->image);
 +    avctx->coded_frame = &ctx->image;
 +    return 0;
 +}
 +
 +static av_cold int libopenjpeg_decode_init_thread_copy(AVCodecContext *avctx)
 +{
 +    LibOpenJPEGContext *ctx = avctx->priv_data;
 +
 +    avctx->coded_frame = &ctx->image;
 +    return 0;
 +}
 +
 +static int libopenjpeg_decode_frame(AVCodecContext *avctx,
 +                                    void *data, int *data_size,
 +                                    AVPacket *avpkt)
 +{
 +    uint8_t *buf = avpkt->data;
 +    int buf_size = avpkt->size;
 +    LibOpenJPEGContext *ctx = avctx->priv_data;
 +    AVFrame *picture = &ctx->image, *output = data;
 +    opj_dinfo_t *dec;
 +    opj_cio_t *stream;
 +    opj_image_t *image;
 +    int width, height, ret = -1;
 +    int pixel_size = 0;
 +    int ispacked = 0;
 +
 +    *data_size = 0;
 +
 +    // Check if input is a raw jpeg2k codestream or in jp2 wrapping
 +    if((AV_RB32(buf) == 12) &&
 +       (AV_RB32(buf + 4) == JP2_SIG_TYPE) &&
 +       (AV_RB32(buf + 8) == JP2_SIG_VALUE)) {
 +        dec = opj_create_decompress(CODEC_JP2);
 +    } else {
 +        // If the AVPacket contains a jp2c box, then skip to
 +        // the starting byte of the codestream.
 +        if (AV_RB32(buf + 4) == AV_RB32("jp2c"))
 +            buf += 8;
 +        dec = opj_create_decompress(CODEC_J2K);
 +    }
 +
 +    if(!dec) {
 +        av_log(avctx, AV_LOG_ERROR, "Error initializing decoder.\n");
 +        return -1;
 +    }
 +    opj_set_event_mgr((opj_common_ptr)dec, NULL, NULL);
 +
 +    ctx->dec_params.cp_limit_decoding = LIMIT_TO_MAIN_HEADER;
 +    // Tie decoder with decoding parameters
 +    opj_setup_decoder(dec, &ctx->dec_params);
 +    stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size);
 +    if(!stream) {
 +        av_log(avctx, AV_LOG_ERROR, "Codestream could not be opened for reading.\n");
 +        opj_destroy_decompress(dec);
 +        return -1;
 +    }
 +
 +    // Decode the header only
 +    image = opj_decode_with_info(dec, stream, NULL);
 +    opj_cio_close(stream);
 +    if(!image) {
 +        av_log(avctx, AV_LOG_ERROR, "Error decoding codestream.\n");
 +        opj_destroy_decompress(dec);
 +        return -1;
 +    }
 +    width  = image->x1 - image->x0;
 +    height = image->y1 - image->y0;
 +    if(av_image_check_size(width, height, 0, avctx) < 0) {
 +        av_log(avctx, AV_LOG_ERROR, "%dx%d dimension invalid.\n", width, height);
 +        goto done;
 +    }
 +    avcodec_set_dimensions(avctx, width, height);
 +
 +    switch (image->numcomps) {
 +    case 1:  avctx->pix_fmt = (image->comps[0].prec == 8) ? PIX_FMT_GRAY8 : PIX_FMT_GRAY16;
 +             break;
 +    case 2:  avctx->pix_fmt = PIX_FMT_GRAY8A;
 +             break;
 +    case 3:
 +    case 4:  avctx->pix_fmt = check_image_attributes(avctx, image);
 +             break;
 +    default: av_log(avctx, AV_LOG_ERROR, "%d components unsupported.\n", image->numcomps);
 +             goto done;
 +    }
 +
 +    if(picture->data[0])
 +        ff_thread_release_buffer(avctx, picture);
 +
 +    if(ff_thread_get_buffer(avctx, picture) < 0){
 +        av_log(avctx, AV_LOG_ERROR, "ff_thread_get_buffer() failed\n");
 +        goto done;
 +    }
 +
 +    ctx->dec_params.cp_limit_decoding = NO_LIMITATION;
-     .long_name      = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"),
 +    // Tie decoder with decoding parameters
 +    opj_setup_decoder(dec, &ctx->dec_params);
 +    stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size);
 +    if(!stream) {
 +        av_log(avctx, AV_LOG_ERROR, "Codestream could not be opened for reading.\n");
 +        goto done;
 +    }
 +
 +    opj_image_destroy(image);
 +    // Decode the codestream
 +    image = opj_decode_with_info(dec, stream, NULL);
 +    opj_cio_close(stream);
 +    if(!image) {
 +        av_log(avctx, AV_LOG_ERROR, "Error decoding codestream.\n");
 +        goto done;
 +    }
 +
 +    pixel_size = av_pix_fmt_descriptors[avctx->pix_fmt].comp[0].step_minus1 + 1;
 +    ispacked = libopenjpeg_ispacked(avctx->pix_fmt);
 +
 +    switch (pixel_size) {
 +    case 1:
 +        if (ispacked) {
 +            libopenjpeg_copy_to_packed8(picture, image);
 +        } else {
 +            libopenjpeg_copyto8(picture, image);
 +        }
 +        break;
 +    case 2:
 +        if (ispacked) {
 +            libopenjpeg_copy_to_packed8(picture, image);
 +        } else {
 +            libopenjpeg_copyto16(picture, image);
 +        }
 +        break;
 +    case 3:
 +    case 4:
 +        if (ispacked) {
 +            libopenjpeg_copy_to_packed8(picture, image);
 +        }
 +        break;
 +    case 6:
 +    case 8:
 +        if (ispacked) {
 +            libopenjpeg_copy_to_packed16(picture, image);
 +        }
 +        break;
 +    default:
 +        av_log(avctx, AV_LOG_ERROR, "unsupported pixel size %d\n", pixel_size);
 +        goto done;
 +    }
 +
 +    *output    = ctx->image;
 +    *data_size = sizeof(AVPicture);
 +    ret = buf_size;
 +
 +done:
 +    opj_image_destroy(image);
 +    opj_destroy_decompress(dec);
 +    return ret;
 +}
 +
 +static av_cold int libopenjpeg_decode_close(AVCodecContext *avctx)
 +{
 +    LibOpenJPEGContext *ctx = avctx->priv_data;
 +
 +    if(ctx->image.data[0])
 +        ff_thread_release_buffer(avctx, &ctx->image);
 +    return 0 ;
 +}
 +
 +
 +AVCodec ff_libopenjpeg_decoder = {
 +    .name             = "libopenjpeg",
 +    .type             = AVMEDIA_TYPE_VIDEO,
 +    .id               = CODEC_ID_JPEG2000,
 +    .priv_data_size   = sizeof(LibOpenJPEGContext),
 +    .init             = libopenjpeg_decode_init,
 +    .close            = libopenjpeg_decode_close,
 +    .decode           = libopenjpeg_decode_frame,
 +    .capabilities     = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
 +    .max_lowres       = 5,
++    .long_name        = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"),
 +    .init_thread_copy = ONLY_IF_THREADS_ENABLED(libopenjpeg_decode_init_thread_copy),
 +};
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -233,15 -226,10 +233,14 @@@ void avcodec_align_dimensions2(AVCodecC
          break;
      }
  
 +    if(s->codec_id == CODEC_ID_IFF_ILBM || s->codec_id == CODEC_ID_IFF_BYTERUN1){
 +        w_align= FFMAX(w_align, 8);
 +    }
 +
      *width = FFALIGN(*width , w_align);
      *height= FFALIGN(*height, h_align);
-     if(s->codec_id == CODEC_ID_H264 || s->lowres)
+     if (s->codec_id == CODEC_ID_H264)
          *height+=2; // some of the optimized chroma MC reads one line too much
-                     // which is also done in mpeg decoders with lowres > 0
  
      for (i = 0; i < 4; i++)
          linesize_align[i] = STRIDE_ALIGN;
@@@ -838,12 -740,6 +837,13 @@@ int attribute_align_arg avcodec_open2(A
      if (!HAVE_THREADS && !(codec->capabilities & CODEC_CAP_AUTO_THREADS))
          avctx->thread_count = 1;
  
 +    if (avctx->codec->max_lowres < avctx->lowres || avctx->lowres < 0) {
 +        av_log(avctx, AV_LOG_ERROR, "The maximum value for lowres supported by the decoder is %d\n",
 +               avctx->codec->max_lowres);
 +        ret = AVERROR(EINVAL);
 +        goto free_and_end;
 +    }
++
      if (av_codec_is_encoder(avctx->codec)) {
          int i;
          if (avctx->codec->sample_fmts) {
Simple merge
@@@ -1852,7 -1754,7 +1852,7 @@@ static void mov_build_index(MOVContext 
          unsigned int stts_sample = 0;
          unsigned int sample_size;
          unsigned int distance = 0;
-         int key_off = sc->keyframe_count && sc->keyframes[0] == 1;
 -        int key_off = (sc->keyframes && sc->keyframes[0] > 0) || (sc->stps_data && sc->stps_data[0] > 0);
++        int key_off = (sc->keyframe_count && sc->keyframes[0] > 0) || (sc->stps_data && sc->stps_data[0] > 0);
  
          current_dts -= sc->dts_shift;
  
diff --cc libavutil/cpu.c
Simple merge
diff --cc libavutil/cpu.h
@@@ -63,9 -60,10 +70,10 @@@ void av_force_cpu_flags(int flags)
   *
   * @warning this function is not thread safe.
   */
 -void av_set_cpu_flags_mask(int mask);
 +attribute_deprecated void av_set_cpu_flags_mask(int mask);
  
  /* The following CPU-specific functions shall not be called directly. */
+ int ff_get_cpu_flags_arm(void);
  int ff_get_cpu_flags_ppc(void);
  int ff_get_cpu_flags_x86(void);