Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 01:19:29 +0000 (03:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 01:19:47 +0000 (03:19 +0200)
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
  Replace av_dlog with normal av_log at trace level

Conflicts:
ffplay.c
libavdevice/fbdev_dec.c
libavfilter/avfilter.c
libavfilter/internal.h
libavfilter/setpts.c
libavfilter/src_movie.c
libavfilter/vf_crop.c
libavfilter/vf_drawtext.c
libavfilter/vf_fieldorder.c
libavformat/assdec.c
libavformat/avidec.c
libavformat/flvdec.c
libavformat/http.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/mov.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mux.c
libavformat/mxfdec.c
libavformat/nsvdec.c
libavformat/oggdec.c
libavformat/r3d.c
libavformat/rtspdec.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
39 files changed:
1  2 
ffplay.c
libavdevice/dv1394.c
libavdevice/fbdev_dec.c
libavfilter/setpts.c
libavfilter/vf_crop.c
libavfilter/vf_fieldorder.c
libavformat/asfdec.c
libavformat/avidec.c
libavformat/flvdec.c
libavformat/hevc.c
libavformat/http.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/mmsh.c
libavformat/mmst.c
libavformat/mov.c
libavformat/mov_chan.c
libavformat/mpeg.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mux.c
libavformat/mxfdec.c
libavformat/mxfenc.c
libavformat/nsvdec.c
libavformat/oggdec.c
libavformat/r3d.c
libavformat/rmdec.c
libavformat/rtmpproto.c
libavformat/rtpdec.c
libavformat/rtpdec_hevc.c
libavformat/rtpenc.c
libavformat/rtsp.c
libavformat/rtspdec.c
libavformat/utils.c
libavresample/audio_convert.c
libavresample/audio_mix.c
libavresample/resample.c
libavresample/utils.c

diff --cc ffplay.c
index 8fa8566,0000000..adeae50
mode 100644,000000..100644
--- /dev/null
+++ b/ffplay.c
@@@ -1,3867 -1,0 +1,3867 @@@
-     av_dlog(NULL, "video: delay=%0.3f A-V=%f\n",
 +/*
 + * 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 <stdint.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 "libavutil/time.h"
 +#include "libavformat/avformat.h"
 +#include "libavdevice/avdevice.h"
 +#include "libswscale/swscale.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/buffersink.h"
 +# include "libavfilter/buffersrc.h"
 +#endif
 +
 +#include <SDL.h>
 +#include <SDL_thread.h>
 +
 +#include "cmdutils.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
 +
 +/* Minimum SDL audio buffer size, in samples. */
 +#define SDL_AUDIO_MIN_BUFFER_SIZE 512
 +/* Calculate actual buffer size keeping in mind not cause too frequent audio callbacks */
 +#define SDL_AUDIO_MAX_CALLBACKS_PER_SEC 30
 +
 +/* no AV sync correction is done if below the minimum AV sync threshold */
 +#define AV_SYNC_THRESHOLD_MIN 0.04
 +/* AV sync correction is done if above the maximum AV sync threshold */
 +#define AV_SYNC_THRESHOLD_MAX 0.1
 +/* If a frame duration is longer than this, it will not be duplicated to compensate AV sync */
 +#define AV_SYNC_FRAMEDUP_THRESHOLD 0.1
 +/* 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
 +
 +/* external clock speed adjustment constants for realtime sources based on buffer fullness */
 +#define EXTERNAL_CLOCK_SPEED_MIN  0.900
 +#define EXTERNAL_CLOCK_SPEED_MAX  1.010
 +#define EXTERNAL_CLOCK_SPEED_STEP 0.001
 +
 +/* we use about AUDIO_DIFF_AVG_NB A-V differences to make the average */
 +#define AUDIO_DIFF_AVG_NB   20
 +
 +/* polls for possible required screen refresh at least this often, should be less than 1/fps */
 +#define REFRESH_RATE 0.01
 +
 +/* NOTE: the size must be big enough to compensate the hardware audio buffersize size */
 +/* TODO: We assume that a decoded and resampled frame fits into this buffer */
 +#define SAMPLE_ARRAY_SIZE (8 * 65536)
 +
 +#define CURSOR_HIDE_DELAY 1000000
 +
 +static int64_t sws_flags = SWS_BICUBIC;
 +
 +typedef struct MyAVPacketList {
 +    AVPacket pkt;
 +    struct MyAVPacketList *next;
 +    int serial;
 +} MyAVPacketList;
 +
 +typedef struct PacketQueue {
 +    MyAVPacketList *first_pkt, *last_pkt;
 +    int nb_packets;
 +    int size;
 +    int abort_request;
 +    int serial;
 +    SDL_mutex *mutex;
 +    SDL_cond *cond;
 +} PacketQueue;
 +
 +#define VIDEO_PICTURE_QUEUE_SIZE 3
 +#define SUBPICTURE_QUEUE_SIZE 16
 +#define SAMPLE_QUEUE_SIZE 9
 +#define FRAME_QUEUE_SIZE FFMAX(SAMPLE_QUEUE_SIZE, FFMAX(VIDEO_PICTURE_QUEUE_SIZE, SUBPICTURE_QUEUE_SIZE))
 +
 +typedef struct AudioParams {
 +    int freq;
 +    int channels;
 +    int64_t channel_layout;
 +    enum AVSampleFormat fmt;
 +    int frame_size;
 +    int bytes_per_sec;
 +} AudioParams;
 +
 +typedef struct Clock {
 +    double pts;           /* clock base */
 +    double pts_drift;     /* clock base minus time at which we updated the clock */
 +    double last_updated;
 +    double speed;
 +    int serial;           /* clock is based on a packet with this serial */
 +    int paused;
 +    int *queue_serial;    /* pointer to the current packet queue serial, used for obsolete clock detection */
 +} Clock;
 +
 +/* Common struct for handling all types of decoded data and allocated render buffers. */
 +typedef struct Frame {
 +    AVFrame *frame;
 +    AVSubtitle sub;
 +    int serial;
 +    double pts;           /* presentation timestamp for the frame */
 +    double duration;      /* estimated duration of the frame */
 +    int64_t pos;          /* byte position of the frame in the input file */
 +    SDL_Overlay *bmp;
 +    int allocated;
 +    int reallocate;
 +    int width;
 +    int height;
 +    AVRational sar;
 +} Frame;
 +
 +typedef struct FrameQueue {
 +    Frame queue[FRAME_QUEUE_SIZE];
 +    int rindex;
 +    int windex;
 +    int size;
 +    int max_size;
 +    int keep_last;
 +    int rindex_shown;
 +    SDL_mutex *mutex;
 +    SDL_cond *cond;
 +    PacketQueue *pktq;
 +} FrameQueue;
 +
 +enum {
 +    AV_SYNC_AUDIO_MASTER, /* default choice */
 +    AV_SYNC_VIDEO_MASTER,
 +    AV_SYNC_EXTERNAL_CLOCK, /* synchronize to an external clock */
 +};
 +
 +typedef struct Decoder {
 +    AVPacket pkt;
 +    AVPacket pkt_temp;
 +    PacketQueue *queue;
 +    AVCodecContext *avctx;
 +    int pkt_serial;
 +    int finished;
 +    int packet_pending;
 +    SDL_cond *empty_queue_cond;
 +    int64_t start_pts;
 +    AVRational start_pts_tb;
 +    int64_t next_pts;
 +    AVRational next_pts_tb;
 +    SDL_Thread *decoder_tid;
 +} Decoder;
 +
 +typedef struct VideoState {
 +    SDL_Thread *read_tid;
 +    AVInputFormat *iformat;
 +    int abort_request;
 +    int force_refresh;
 +    int paused;
 +    int last_paused;
 +    int queue_attachments_req;
 +    int seek_req;
 +    int seek_flags;
 +    int64_t seek_pos;
 +    int64_t seek_rel;
 +    int read_pause_return;
 +    AVFormatContext *ic;
 +    int realtime;
 +
 +    Clock audclk;
 +    Clock vidclk;
 +    Clock extclk;
 +
 +    FrameQueue pictq;
 +    FrameQueue subpq;
 +    FrameQueue sampq;
 +
 +    Decoder auddec;
 +    Decoder viddec;
 +    Decoder subdec;
 +
 +    int audio_stream;
 +
 +    int av_sync_type;
 +
 +    double audio_clock;
 +    int audio_clock_serial;
 +    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;
 +    uint8_t silence_buf[SDL_AUDIO_MIN_BUFFER_SIZE];
 +    uint8_t *audio_buf;
 +    uint8_t *audio_buf1;
 +    unsigned int audio_buf_size; /* in bytes */
 +    unsigned int audio_buf1_size;
 +    int audio_buf_index; /* in bytes */
 +    int audio_write_buf_size;
 +    struct AudioParams audio_src;
 +#if CONFIG_AVFILTER
 +    struct AudioParams audio_filter_src;
 +#endif
 +    struct AudioParams audio_tgt;
 +    struct SwrContext *swr_ctx;
 +    int frame_drops_early;
 +    int frame_drops_late;
 +
 +    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;
 +    double last_vis_time;
 +
 +    int subtitle_stream;
 +    AVStream *subtitle_st;
 +    PacketQueue subtitleq;
 +
 +    double frame_timer;
 +    double frame_last_returned_time;
 +    double frame_last_filter_delay;
 +    int video_stream;
 +    AVStream *video_st;
 +    PacketQueue videoq;
 +    double max_frame_duration;      // maximum duration of a frame - above this, we consider the jump a timestamp discontinuity
 +#if !CONFIG_AVFILTER
 +    struct SwsContext *img_convert_ctx;
 +#endif
 +    SDL_Rect last_display_rect;
 +    int eof;
 +
 +    char filename[1024];
 +    int width, height, xleft, ytop;
 +    int step;
 +
 +#if CONFIG_AVFILTER
 +    int vfilter_idx;
 +    AVFilterContext *in_video_filter;   // the first filter in the video chain
 +    AVFilterContext *out_video_filter;  // the last filter in the video chain
 +    AVFilterContext *in_audio_filter;   // the first filter in the audio chain
 +    AVFilterContext *out_audio_filter;  // the last filter in the audio chain
 +    AVFilterGraph *agraph;              // audio filter graph
 +#endif
 +
 +    int last_video_stream, last_audio_stream, last_subtitle_stream;
 +
 +    SDL_cond *continue_read_thread;
 +} VideoState;
 +
 +/* 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 default_width  = 640;
 +static int default_height = 480;
 +static int screen_width  = 0;
 +static int screen_height = 0;
 +static int audio_disable;
 +static int video_disable;
 +static int subtitle_disable;
 +static const char* wanted_stream_spec[AVMEDIA_TYPE_NB] = {0};
 +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 fast = 0;
 +static int genpts = 0;
 +static int lowres = 0;
 +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 int infinite_buffer = -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;
 +double rdftspeed = 0.02;
 +static int64_t cursor_last_shown;
 +static int cursor_hidden = 0;
 +#if CONFIG_AVFILTER
 +static const char **vfilters_list = NULL;
 +static int nb_vfilters = 0;
 +static char *afilters = NULL;
 +#endif
 +static int autorotate = 1;
 +
 +/* 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_QUIT_EVENT    (SDL_USEREVENT + 2)
 +
 +static SDL_Surface *screen;
 +
 +#if CONFIG_AVFILTER
 +static int opt_add_vfilter(void *optctx, const char *opt, const char *arg)
 +{
 +    GROW_ARRAY(vfilters_list, nb_vfilters);
 +    vfilters_list[nb_vfilters - 1] = arg;
 +    return 0;
 +}
 +#endif
 +
 +static inline
 +int cmp_audio_fmts(enum AVSampleFormat fmt1, int64_t channel_count1,
 +                   enum AVSampleFormat fmt2, int64_t channel_count2)
 +{
 +    /* If channel count == 1, planar and non-planar formats are the same */
 +    if (channel_count1 == 1 && channel_count2 == 1)
 +        return av_get_packed_sample_fmt(fmt1) != av_get_packed_sample_fmt(fmt2);
 +    else
 +        return channel_count1 != channel_count2 || fmt1 != fmt2;
 +}
 +
 +static inline
 +int64_t get_valid_channel_layout(int64_t channel_layout, int channels)
 +{
 +    if (channel_layout && av_get_channel_layout_nb_channels(channel_layout) == channels)
 +        return channel_layout;
 +    else
 +        return 0;
 +}
 +
 +static void free_picture(Frame *vp);
 +
 +static int packet_queue_put_private(PacketQueue *q, AVPacket *pkt)
 +{
 +    MyAVPacketList *pkt1;
 +
 +    if (q->abort_request)
 +       return -1;
 +
 +    pkt1 = av_malloc(sizeof(MyAVPacketList));
 +    if (!pkt1)
 +        return -1;
 +    pkt1->pkt = *pkt;
 +    pkt1->next = NULL;
 +    if (pkt == &flush_pkt)
 +        q->serial++;
 +    pkt1->serial = q->serial;
 +
 +    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);
 +    return 0;
 +}
 +
 +static int packet_queue_put(PacketQueue *q, AVPacket *pkt)
 +{
 +    int ret;
 +
 +    /* duplicate the packet */
 +    if (pkt != &flush_pkt && av_dup_packet(pkt) < 0)
 +        return -1;
 +
 +    SDL_LockMutex(q->mutex);
 +    ret = packet_queue_put_private(q, pkt);
 +    SDL_UnlockMutex(q->mutex);
 +
 +    if (pkt != &flush_pkt && ret < 0)
 +        av_free_packet(pkt);
 +
 +    return ret;
 +}
 +
 +static int packet_queue_put_nullpacket(PacketQueue *q, int stream_index)
 +{
 +    AVPacket pkt1, *pkt = &pkt1;
 +    av_init_packet(pkt);
 +    pkt->data = NULL;
 +    pkt->size = 0;
 +    pkt->stream_index = stream_index;
 +    return packet_queue_put(q, pkt);
 +}
 +
 +/* packet queue handling */
 +static void packet_queue_init(PacketQueue *q)
 +{
 +    memset(q, 0, sizeof(PacketQueue));
 +    q->mutex = SDL_CreateMutex();
 +    q->cond = SDL_CreateCond();
 +    q->abort_request = 1;
 +}
 +
 +static void packet_queue_flush(PacketQueue *q)
 +{
 +    MyAVPacketList *pkt, *pkt1;
 +
 +    SDL_LockMutex(q->mutex);
 +    for (pkt = q->first_pkt; pkt; 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_destroy(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);
 +}
 +
 +static void packet_queue_start(PacketQueue *q)
 +{
 +    SDL_LockMutex(q->mutex);
 +    q->abort_request = 0;
 +    packet_queue_put_private(q, &flush_pkt);
 +    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, int *serial)
 +{
 +    MyAVPacketList *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;
 +            if (serial)
 +                *serial = pkt1->serial;
 +            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 void decoder_init(Decoder *d, AVCodecContext *avctx, PacketQueue *queue, SDL_cond *empty_queue_cond) {
 +    memset(d, 0, sizeof(Decoder));
 +    d->avctx = avctx;
 +    d->queue = queue;
 +    d->empty_queue_cond = empty_queue_cond;
 +    d->start_pts = AV_NOPTS_VALUE;
 +}
 +
 +static int decoder_decode_frame(Decoder *d, AVFrame *frame, AVSubtitle *sub) {
 +    int got_frame = 0;
 +
 +    do {
 +        int ret = -1;
 +
 +        if (d->queue->abort_request)
 +            return -1;
 +
 +        if (!d->packet_pending || d->queue->serial != d->pkt_serial) {
 +            AVPacket pkt;
 +            do {
 +                if (d->queue->nb_packets == 0)
 +                    SDL_CondSignal(d->empty_queue_cond);
 +                if (packet_queue_get(d->queue, &pkt, 1, &d->pkt_serial) < 0)
 +                    return -1;
 +                if (pkt.data == flush_pkt.data) {
 +                    avcodec_flush_buffers(d->avctx);
 +                    d->finished = 0;
 +                    d->next_pts = d->start_pts;
 +                    d->next_pts_tb = d->start_pts_tb;
 +                }
 +            } while (pkt.data == flush_pkt.data || d->queue->serial != d->pkt_serial);
 +            av_free_packet(&d->pkt);
 +            d->pkt_temp = d->pkt = pkt;
 +            d->packet_pending = 1;
 +        }
 +
 +        switch (d->avctx->codec_type) {
 +            case AVMEDIA_TYPE_VIDEO:
 +                ret = avcodec_decode_video2(d->avctx, frame, &got_frame, &d->pkt_temp);
 +                if (got_frame) {
 +                    if (decoder_reorder_pts == -1) {
 +                        frame->pts = av_frame_get_best_effort_timestamp(frame);
 +                    } else if (decoder_reorder_pts) {
 +                        frame->pts = frame->pkt_pts;
 +                    } else {
 +                        frame->pts = frame->pkt_dts;
 +                    }
 +                }
 +                break;
 +            case AVMEDIA_TYPE_AUDIO:
 +                ret = avcodec_decode_audio4(d->avctx, frame, &got_frame, &d->pkt_temp);
 +                if (got_frame) {
 +                    AVRational tb = (AVRational){1, frame->sample_rate};
 +                    if (frame->pts != AV_NOPTS_VALUE)
 +                        frame->pts = av_rescale_q(frame->pts, d->avctx->time_base, tb);
 +                    else if (frame->pkt_pts != AV_NOPTS_VALUE)
 +                        frame->pts = av_rescale_q(frame->pkt_pts, av_codec_get_pkt_timebase(d->avctx), tb);
 +                    else if (d->next_pts != AV_NOPTS_VALUE)
 +                        frame->pts = av_rescale_q(d->next_pts, d->next_pts_tb, tb);
 +                    if (frame->pts != AV_NOPTS_VALUE) {
 +                        d->next_pts = frame->pts + frame->nb_samples;
 +                        d->next_pts_tb = tb;
 +                    }
 +                }
 +                break;
 +            case AVMEDIA_TYPE_SUBTITLE:
 +                ret = avcodec_decode_subtitle2(d->avctx, sub, &got_frame, &d->pkt_temp);
 +                break;
 +        }
 +
 +        if (ret < 0) {
 +            d->packet_pending = 0;
 +        } else {
 +            d->pkt_temp.dts =
 +            d->pkt_temp.pts = AV_NOPTS_VALUE;
 +            if (d->pkt_temp.data) {
 +                if (d->avctx->codec_type != AVMEDIA_TYPE_AUDIO)
 +                    ret = d->pkt_temp.size;
 +                d->pkt_temp.data += ret;
 +                d->pkt_temp.size -= ret;
 +                if (d->pkt_temp.size <= 0)
 +                    d->packet_pending = 0;
 +            } else {
 +                if (!got_frame) {
 +                    d->packet_pending = 0;
 +                    d->finished = d->pkt_serial;
 +                }
 +            }
 +        }
 +    } while (!got_frame && !d->finished);
 +
 +    return got_frame;
 +}
 +
 +static void decoder_destroy(Decoder *d) {
 +    av_free_packet(&d->pkt);
 +}
 +
 +static void frame_queue_unref_item(Frame *vp)
 +{
 +    av_frame_unref(vp->frame);
 +    avsubtitle_free(&vp->sub);
 +}
 +
 +static int frame_queue_init(FrameQueue *f, PacketQueue *pktq, int max_size, int keep_last)
 +{
 +    int i;
 +    memset(f, 0, sizeof(FrameQueue));
 +    if (!(f->mutex = SDL_CreateMutex()))
 +        return AVERROR(ENOMEM);
 +    if (!(f->cond = SDL_CreateCond()))
 +        return AVERROR(ENOMEM);
 +    f->pktq = pktq;
 +    f->max_size = FFMIN(max_size, FRAME_QUEUE_SIZE);
 +    f->keep_last = !!keep_last;
 +    for (i = 0; i < f->max_size; i++)
 +        if (!(f->queue[i].frame = av_frame_alloc()))
 +            return AVERROR(ENOMEM);
 +    return 0;
 +}
 +
 +static void frame_queue_destory(FrameQueue *f)
 +{
 +    int i;
 +    for (i = 0; i < f->max_size; i++) {
 +        Frame *vp = &f->queue[i];
 +        frame_queue_unref_item(vp);
 +        av_frame_free(&vp->frame);
 +        free_picture(vp);
 +    }
 +    SDL_DestroyMutex(f->mutex);
 +    SDL_DestroyCond(f->cond);
 +}
 +
 +static void frame_queue_signal(FrameQueue *f)
 +{
 +    SDL_LockMutex(f->mutex);
 +    SDL_CondSignal(f->cond);
 +    SDL_UnlockMutex(f->mutex);
 +}
 +
 +static Frame *frame_queue_peek(FrameQueue *f)
 +{
 +    return &f->queue[(f->rindex + f->rindex_shown) % f->max_size];
 +}
 +
 +static Frame *frame_queue_peek_next(FrameQueue *f)
 +{
 +    return &f->queue[(f->rindex + f->rindex_shown + 1) % f->max_size];
 +}
 +
 +static Frame *frame_queue_peek_last(FrameQueue *f)
 +{
 +    return &f->queue[f->rindex];
 +}
 +
 +static Frame *frame_queue_peek_writable(FrameQueue *f)
 +{
 +    /* wait until we have space to put a new frame */
 +    SDL_LockMutex(f->mutex);
 +    while (f->size >= f->max_size &&
 +           !f->pktq->abort_request) {
 +        SDL_CondWait(f->cond, f->mutex);
 +    }
 +    SDL_UnlockMutex(f->mutex);
 +
 +    if (f->pktq->abort_request)
 +        return NULL;
 +
 +    return &f->queue[f->windex];
 +}
 +
 +static Frame *frame_queue_peek_readable(FrameQueue *f)
 +{
 +    /* wait until we have a readable a new frame */
 +    SDL_LockMutex(f->mutex);
 +    while (f->size - f->rindex_shown <= 0 &&
 +           !f->pktq->abort_request) {
 +        SDL_CondWait(f->cond, f->mutex);
 +    }
 +    SDL_UnlockMutex(f->mutex);
 +
 +    if (f->pktq->abort_request)
 +        return NULL;
 +
 +    return &f->queue[(f->rindex + f->rindex_shown) % f->max_size];
 +}
 +
 +static void frame_queue_push(FrameQueue *f)
 +{
 +    if (++f->windex == f->max_size)
 +        f->windex = 0;
 +    SDL_LockMutex(f->mutex);
 +    f->size++;
 +    SDL_CondSignal(f->cond);
 +    SDL_UnlockMutex(f->mutex);
 +}
 +
 +static void frame_queue_next(FrameQueue *f)
 +{
 +    if (f->keep_last && !f->rindex_shown) {
 +        f->rindex_shown = 1;
 +        return;
 +    }
 +    frame_queue_unref_item(&f->queue[f->rindex]);
 +    if (++f->rindex == f->max_size)
 +        f->rindex = 0;
 +    SDL_LockMutex(f->mutex);
 +    f->size--;
 +    SDL_CondSignal(f->cond);
 +    SDL_UnlockMutex(f->mutex);
 +}
 +
 +/* jump back to the previous frame if available by resetting rindex_shown */
 +static int frame_queue_prev(FrameQueue *f)
 +{
 +    int ret = f->rindex_shown;
 +    f->rindex_shown = 0;
 +    return ret;
 +}
 +
 +/* return the number of undisplayed frames in the queue */
 +static int frame_queue_nb_remaining(FrameQueue *f)
 +{
 +    return f->size - f->rindex_shown;
 +}
 +
 +/* return last shown position */
 +static int64_t frame_queue_last_pos(FrameQueue *f)
 +{
 +    Frame *fp = &f->queue[f->rindex];
 +    if (f->rindex_shown && fp->serial == f->pktq->serial)
 +        return fp->pos;
 +    else
 +        return -1;
 +}
 +
 +static void decoder_abort(Decoder *d, FrameQueue *fq)
 +{
 +    packet_queue_abort(d->queue);
 +    frame_queue_signal(fq);
 +    SDL_WaitThread(d->decoder_tid, NULL);
 +    d->decoder_tid = NULL;
 +    packet_queue_flush(d->queue);
 +}
 +
 +static inline void fill_rectangle(SDL_Surface *screen,
 +                                  int x, int y, int w, int h, int color, int update)
 +{
 +    SDL_Rect rect;
 +    rect.x = x;
 +    rect.y = y;
 +    rect.w = w;
 +    rect.h = h;
 +    SDL_FillRect(screen, &rect, color);
 +    if (update && w > 0 && h > 0)
 +        SDL_UpdateRect(screen, x, y, w, h);
 +}
 +
 +/* draw only the border of a rectangle */
 +static void fill_border(int xleft, int ytop, int width, int height, int x, int y, int w, int h, int color, int update)
 +{
 +    int w1, w2, h1, h2;
 +
 +    /* fill the background */
 +    w1 = x;
 +    if (w1 < 0)
 +        w1 = 0;
 +    w2 = width - (x + w);
 +    if (w2 < 0)
 +        w2 = 0;
 +    h1 = y;
 +    if (h1 < 0)
 +        h1 = 0;
 +    h2 = height - (y + h);
 +    if (h2 < 0)
 +        h2 = 0;
 +    fill_rectangle(screen,
 +                   xleft, ytop,
 +                   w1, height,
 +                   color, update);
 +    fill_rectangle(screen,
 +                   xleft + width - w2, ytop,
 +                   w2, height,
 +                   color, update);
 +    fill_rectangle(screen,
 +                   xleft + w1, ytop,
 +                   width - w1 - w2, h1,
 +                   color, update);
 +    fill_rectangle(screen,
 +                   xleft + w1, ytop + height - h2,
 +                   width - w1 - w2, h2,
 +                   color, update);
 +}
 +
 +#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_picture(Frame *vp)
 +{
 +     if (vp->bmp) {
 +         SDL_FreeYUVOverlay(vp->bmp);
 +         vp->bmp = NULL;
 +     }
 +}
 +
 +static void calculate_display_rect(SDL_Rect *rect,
 +                                   int scr_xleft, int scr_ytop, int scr_width, int scr_height,
 +                                   int pic_width, int pic_height, AVRational pic_sar)
 +{
 +    float aspect_ratio;
 +    int width, height, x, y;
 +
 +    if (pic_sar.num == 0)
 +        aspect_ratio = 0;
 +    else
 +        aspect_ratio = av_q2d(pic_sar);
 +
 +    if (aspect_ratio <= 0.0)
 +        aspect_ratio = 1.0;
 +    aspect_ratio *= (float)pic_width / (float)pic_height;
 +
 +    /* XXX: we suppose the screen has a 1.0 pixel ratio */
 +    height = scr_height;
 +    width = ((int)rint(height * aspect_ratio)) & ~1;
 +    if (width > scr_width) {
 +        width = scr_width;
 +        height = ((int)rint(width / aspect_ratio)) & ~1;
 +    }
 +    x = (scr_width - width) / 2;
 +    y = (scr_height - height) / 2;
 +    rect->x = scr_xleft + x;
 +    rect->y = scr_ytop  + y;
 +    rect->w = FFMAX(width,  1);
 +    rect->h = FFMAX(height, 1);
 +}
 +
 +static void video_image_display(VideoState *is)
 +{
 +    Frame *vp;
 +    Frame *sp;
 +    AVPicture pict;
 +    SDL_Rect rect;
 +    int i;
 +
 +    vp = frame_queue_peek(&is->pictq);
 +    if (vp->bmp) {
 +        if (is->subtitle_st) {
 +            if (frame_queue_nb_remaining(&is->subpq) > 0) {
 +                sp = frame_queue_peek(&is->subpq);
 +
 +                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);
 +                }
 +            }
 +        }
 +
 +        calculate_display_rect(&rect, is->xleft, is->ytop, is->width, is->height, vp->width, vp->height, vp->sar);
 +
 +        SDL_DisplayYUVOverlay(vp->bmp, &rect);
 +
 +        if (rect.x != is->last_display_rect.x || rect.y != is->last_display_rect.y || rect.w != is->last_display_rect.w || rect.h != is->last_display_rect.h || is->force_refresh) {
 +            int bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
 +            fill_border(is->xleft, is->ytop, is->width, is->height, rect.x, rect.y, rect.w, rect.h, bgcolor, 1);
 +            is->last_display_rect = 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;
 +    int64_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_relative() - 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, 0);
 +
 +        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, 0);
 +                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, 0);
 +        }
 +        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_array(nb_freq, 4 *sizeof(*s->rdft_data));
 +        }
 +        if (!s->rdft || !s->rdft_data){
 +            av_log(NULL, AV_LOG_ERROR, "Failed to allocate buffers for RDFT, switching to waves display\n");
 +            s->show_mode = SHOW_MODE_WAVES;
 +        } else {
 +            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 it is 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, 0);
 +            }
 +        }
 +        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)
 +{
 +    /* XXX: use a special url_shutdown call to abort parse cleanly */
 +    is->abort_request = 1;
 +    SDL_WaitThread(is->read_tid, NULL);
 +    packet_queue_destroy(&is->videoq);
 +    packet_queue_destroy(&is->audioq);
 +    packet_queue_destroy(&is->subtitleq);
 +
 +    /* free all pictures */
 +    frame_queue_destory(&is->pictq);
 +    frame_queue_destory(&is->sampq);
 +    frame_queue_destory(&is->subpq);
 +    SDL_DestroyCond(is->continue_read_thread);
 +#if !CONFIG_AVFILTER
 +    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
 +    av_freep(&vfilters_list);
 +#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 void set_default_window_size(int width, int height, AVRational sar)
 +{
 +    SDL_Rect rect;
 +    calculate_display_rect(&rect, 0, 0, INT_MAX, height, width, height, sar);
 +    default_width  = rect.w;
 +    default_height = rect.h;
 +}
 +
 +static int video_open(VideoState *is, int force_set_video_mode, Frame *vp)
 +{
 +    int flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL;
 +    int w,h;
 +
 +    if (is_full_screen) flags |= SDL_FULLSCREEN;
 +    else                flags |= SDL_RESIZABLE;
 +
 +    if (vp && vp->width)
 +        set_default_window_size(vp->width, vp->height, vp->sar);
 +
 +    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;
 +    } else {
 +        w = default_width;
 +        h = default_height;
 +    }
 +    w = FFMIN(16383, w);
 +    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) {
 +        av_log(NULL, AV_LOG_FATAL, "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, NULL);
 +    if (is->audio_st && is->show_mode != SHOW_MODE_VIDEO)
 +        video_audio_display(is);
 +    else if (is->video_st)
 +        video_image_display(is);
 +}
 +
 +static double get_clock(Clock *c)
 +{
 +    if (*c->queue_serial != c->serial)
 +        return NAN;
 +    if (c->paused) {
 +        return c->pts;
 +    } else {
 +        double time = av_gettime_relative() / 1000000.0;
 +        return c->pts_drift + time - (time - c->last_updated) * (1.0 - c->speed);
 +    }
 +}
 +
 +static void set_clock_at(Clock *c, double pts, int serial, double time)
 +{
 +    c->pts = pts;
 +    c->last_updated = time;
 +    c->pts_drift = c->pts - time;
 +    c->serial = serial;
 +}
 +
 +static void set_clock(Clock *c, double pts, int serial)
 +{
 +    double time = av_gettime_relative() / 1000000.0;
 +    set_clock_at(c, pts, serial, time);
 +}
 +
 +static void set_clock_speed(Clock *c, double speed)
 +{
 +    set_clock(c, get_clock(c), c->serial);
 +    c->speed = speed;
 +}
 +
 +static void init_clock(Clock *c, int *queue_serial)
 +{
 +    c->speed = 1.0;
 +    c->paused = 0;
 +    c->queue_serial = queue_serial;
 +    set_clock(c, NAN, -1);
 +}
 +
 +static void sync_clock_to_slave(Clock *c, Clock *slave)
 +{
 +    double clock = get_clock(c);
 +    double slave_clock = get_clock(slave);
 +    if (!isnan(slave_clock) && (isnan(clock) || fabs(clock - slave_clock) > AV_NOSYNC_THRESHOLD))
 +        set_clock(c, slave_clock, slave->serial);
 +}
 +
 +static int get_master_sync_type(VideoState *is) {
 +    if (is->av_sync_type == AV_SYNC_VIDEO_MASTER) {
 +        if (is->video_st)
 +            return AV_SYNC_VIDEO_MASTER;
 +        else
 +            return AV_SYNC_AUDIO_MASTER;
 +    } else if (is->av_sync_type == AV_SYNC_AUDIO_MASTER) {
 +        if (is->audio_st)
 +            return AV_SYNC_AUDIO_MASTER;
 +        else
 +            return AV_SYNC_EXTERNAL_CLOCK;
 +    } else {
 +        return AV_SYNC_EXTERNAL_CLOCK;
 +    }
 +}
 +
 +/* get the current master clock value */
 +static double get_master_clock(VideoState *is)
 +{
 +    double val;
 +
 +    switch (get_master_sync_type(is)) {
 +        case AV_SYNC_VIDEO_MASTER:
 +            val = get_clock(&is->vidclk);
 +            break;
 +        case AV_SYNC_AUDIO_MASTER:
 +            val = get_clock(&is->audclk);
 +            break;
 +        default:
 +            val = get_clock(&is->extclk);
 +            break;
 +    }
 +    return val;
 +}
 +
 +static void check_external_clock_speed(VideoState *is) {
 +   if (is->video_stream >= 0 && is->videoq.nb_packets <= MIN_FRAMES / 2 ||
 +       is->audio_stream >= 0 && is->audioq.nb_packets <= MIN_FRAMES / 2) {
 +       set_clock_speed(&is->extclk, FFMAX(EXTERNAL_CLOCK_SPEED_MIN, is->extclk.speed - EXTERNAL_CLOCK_SPEED_STEP));
 +   } else if ((is->video_stream < 0 || is->videoq.nb_packets > MIN_FRAMES * 2) &&
 +              (is->audio_stream < 0 || is->audioq.nb_packets > MIN_FRAMES * 2)) {
 +       set_clock_speed(&is->extclk, FFMIN(EXTERNAL_CLOCK_SPEED_MAX, is->extclk.speed + EXTERNAL_CLOCK_SPEED_STEP));
 +   } else {
 +       double speed = is->extclk.speed;
 +       if (speed != 1.0)
 +           set_clock_speed(&is->extclk, speed + EXTERNAL_CLOCK_SPEED_STEP * (1.0 - speed) / fabs(1.0 - speed));
 +   }
 +}
 +
 +/* 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;
 +        SDL_CondSignal(is->continue_read_thread);
 +    }
 +}
 +
 +/* pause or resume the video */
 +static void stream_toggle_pause(VideoState *is)
 +{
 +    if (is->paused) {
 +        is->frame_timer += av_gettime_relative() / 1000000.0 - is->vidclk.last_updated;
 +        if (is->read_pause_return != AVERROR(ENOSYS)) {
 +            is->vidclk.paused = 0;
 +        }
 +        set_clock(&is->vidclk, get_clock(&is->vidclk), is->vidclk.serial);
 +    }
 +    set_clock(&is->extclk, get_clock(&is->extclk), is->extclk.serial);
 +    is->paused = is->audclk.paused = is->vidclk.paused = is->extclk.paused = !is->paused;
 +}
 +
 +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 double compute_target_delay(double delay, VideoState *is)
 +{
 +    double sync_threshold, diff;
 +
 +    /* update delay to follow master synchronisation source */
 +    if (get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER) {
 +        /* if video is slave, we try to correct big delays by
 +           duplicating or deleting a frame */
 +        diff = get_clock(&is->vidclk) - 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_MIN, FFMIN(AV_SYNC_THRESHOLD_MAX, delay));
 +        if (!isnan(diff) && fabs(diff) < is->max_frame_duration) {
 +            if (diff <= -sync_threshold)
 +                delay = FFMAX(0, delay + diff);
 +            else if (diff >= sync_threshold && delay > AV_SYNC_FRAMEDUP_THRESHOLD)
 +                delay = delay + diff;
 +            else if (diff >= sync_threshold)
 +                delay = 2 * delay;
 +        }
 +    }
 +
-                 av_dlog(NULL, "diff=%f adiff=%f sample_diff=%d apts=%0.3f %f\n",
++    av_log(NULL, AV_LOG_TRACE, "video: delay=%0.3f A-V=%f\n",
 +            delay, -diff);
 +
 +    return delay;
 +}
 +
 +static double vp_duration(VideoState *is, Frame *vp, Frame *nextvp) {
 +    if (vp->serial == nextvp->serial) {
 +        double duration = nextvp->pts - vp->pts;
 +        if (isnan(duration) || duration <= 0 || duration > is->max_frame_duration)
 +            return vp->duration;
 +        else
 +            return duration;
 +    } else {
 +        return 0.0;
 +    }
 +}
 +
 +static void update_video_pts(VideoState *is, double pts, int64_t pos, int serial) {
 +    /* update current video pts */
 +    set_clock(&is->vidclk, pts, serial);
 +    sync_clock_to_slave(&is->extclk, &is->vidclk);
 +}
 +
 +/* called to display each frame */
 +static void video_refresh(void *opaque, double *remaining_time)
 +{
 +    VideoState *is = opaque;
 +    double time;
 +
 +    Frame *sp, *sp2;
 +
 +    if (!is->paused && get_master_sync_type(is) == AV_SYNC_EXTERNAL_CLOCK && is->realtime)
 +        check_external_clock_speed(is);
 +
 +    if (!display_disable && is->show_mode != SHOW_MODE_VIDEO && is->audio_st) {
 +        time = av_gettime_relative() / 1000000.0;
 +        if (is->force_refresh || is->last_vis_time + rdftspeed < time) {
 +            video_display(is);
 +            is->last_vis_time = time;
 +        }
 +        *remaining_time = FFMIN(*remaining_time, is->last_vis_time + rdftspeed - time);
 +    }
 +
 +    if (is->video_st) {
 +        int redisplay = 0;
 +        if (is->force_refresh)
 +            redisplay = frame_queue_prev(&is->pictq);
 +retry:
 +        if (frame_queue_nb_remaining(&is->pictq) == 0) {
 +            // nothing to do, no picture to display in the queue
 +        } else {
 +            double last_duration, duration, delay;
 +            Frame *vp, *lastvp;
 +
 +            /* dequeue the picture */
 +            lastvp = frame_queue_peek_last(&is->pictq);
 +            vp = frame_queue_peek(&is->pictq);
 +
 +            if (vp->serial != is->videoq.serial) {
 +                frame_queue_next(&is->pictq);
 +                redisplay = 0;
 +                goto retry;
 +            }
 +
 +            if (lastvp->serial != vp->serial && !redisplay)
 +                is->frame_timer = av_gettime_relative() / 1000000.0;
 +
 +            if (is->paused)
 +                goto display;
 +
 +            /* compute nominal last_duration */
 +            last_duration = vp_duration(is, lastvp, vp);
 +            if (redisplay)
 +                delay = 0.0;
 +            else
 +                delay = compute_target_delay(last_duration, is);
 +
 +            time= av_gettime_relative()/1000000.0;
 +            if (time < is->frame_timer + delay && !redisplay) {
 +                *remaining_time = FFMIN(is->frame_timer + delay - time, *remaining_time);
 +                return;
 +            }
 +
 +            is->frame_timer += delay;
 +            if (delay > 0 && time - is->frame_timer > AV_SYNC_THRESHOLD_MAX)
 +                is->frame_timer = time;
 +
 +            SDL_LockMutex(is->pictq.mutex);
 +            if (!redisplay && !isnan(vp->pts))
 +                update_video_pts(is, vp->pts, vp->pos, vp->serial);
 +            SDL_UnlockMutex(is->pictq.mutex);
 +
 +            if (frame_queue_nb_remaining(&is->pictq) > 1) {
 +                Frame *nextvp = frame_queue_peek_next(&is->pictq);
 +                duration = vp_duration(is, vp, nextvp);
 +                if(!is->step && (redisplay || framedrop>0 || (framedrop && get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER)) && time > is->frame_timer + duration){
 +                    if (!redisplay)
 +                        is->frame_drops_late++;
 +                    frame_queue_next(&is->pictq);
 +                    redisplay = 0;
 +                    goto retry;
 +                }
 +            }
 +
 +            if (is->subtitle_st) {
 +                    while (frame_queue_nb_remaining(&is->subpq) > 0) {
 +                        sp = frame_queue_peek(&is->subpq);
 +
 +                        if (frame_queue_nb_remaining(&is->subpq) > 1)
 +                            sp2 = frame_queue_peek_next(&is->subpq);
 +                        else
 +                            sp2 = NULL;
 +
 +                        if (sp->serial != is->subtitleq.serial
 +                                || (is->vidclk.pts > (sp->pts + ((float) sp->sub.end_display_time / 1000)))
 +                                || (sp2 && is->vidclk.pts > (sp2->pts + ((float) sp2->sub.start_display_time / 1000))))
 +                        {
 +                            frame_queue_next(&is->subpq);
 +                        } else {
 +                            break;
 +                        }
 +                    }
 +            }
 +
 +display:
 +            /* display picture */
 +            if (!display_disable && is->show_mode == SHOW_MODE_VIDEO)
 +                video_display(is);
 +
 +            frame_queue_next(&is->pictq);
 +
 +            if (is->step && !is->paused)
 +                stream_toggle_pause(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_relative();
 +        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_clock(&is->audclk) - get_clock(&is->vidclk);
 +            else if (is->video_st)
 +                av_diff = get_master_clock(is) - get_clock(&is->vidclk);
 +            else if (is->audio_st)
 +                av_diff = get_master_clock(is) - get_clock(&is->audclk);
 +            av_log(NULL, AV_LOG_INFO,
 +                   "%7.2f %s:%7.3f fd=%4d aq=%5dKB vq=%5dKB sq=%5dB f=%"PRId64"/%"PRId64"   \r",
 +                   get_master_clock(is),
 +                   (is->audio_st && is->video_st) ? "A-V" : (is->video_st ? "M-V" : (is->audio_st ? "M-A" : "   ")),
 +                   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(VideoState *is)
 +{
 +    Frame *vp;
 +    int64_t bufferdiff;
 +
 +    vp = &is->pictq.queue[is->pictq.windex];
 +
 +    free_picture(vp);
 +
 +    video_open(is, 0, vp);
 +
 +    vp->bmp = SDL_CreateYUVOverlay(vp->width, vp->height,
 +                                   SDL_YV12_OVERLAY,
 +                                   screen);
 +    bufferdiff = vp->bmp ? FFMAX(vp->bmp->pixels[0], vp->bmp->pixels[1]) - FFMIN(vp->bmp->pixels[0], vp->bmp->pixels[1]) : 0;
 +    if (!vp->bmp || vp->bmp->pitches[0] < vp->width || bufferdiff < (int64_t)vp->height * vp->bmp->pitches[0]) {
 +        /* SDL allocates a buffer smaller than requested if the video
 +         * overlay hardware is unable to support the requested size. */
 +        av_log(NULL, AV_LOG_FATAL,
 +               "Error: the video system does not support an image\n"
 +                        "size of %dx%d pixels. Try using -lowres or -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 void duplicate_right_border_pixels(SDL_Overlay *bmp) {
 +    int i, width, height;
 +    Uint8 *p, *maxp;
 +    for (i = 0; i < 3; i++) {
 +        width  = bmp->w;
 +        height = bmp->h;
 +        if (i > 0) {
 +            width  >>= 1;
 +            height >>= 1;
 +        }
 +        if (bmp->pitches[i] > width) {
 +            maxp = bmp->pixels[i] + bmp->pitches[i] * height - 1;
 +            for (p = bmp->pixels[i] + width - 1; p < maxp; p += bmp->pitches[i])
 +                *(p+1) = *p;
 +        }
 +    }
 +}
 +
 +static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, double duration, int64_t pos, int serial)
 +{
 +    Frame *vp;
 +
 +#if defined(DEBUG_SYNC) && 0
 +    printf("frame_type=%c pts=%0.3f\n",
 +           av_get_picture_type_char(src_frame->pict_type), pts);
 +#endif
 +
 +    if (!(vp = frame_queue_peek_writable(&is->pictq)))
 +        return -1;
 +
 +    vp->sar = src_frame->sample_aspect_ratio;
 +
 +    /* alloc or resize hardware picture buffer */
 +    if (!vp->bmp || vp->reallocate || !vp->allocated ||
 +        vp->width  != src_frame->width ||
 +        vp->height != src_frame->height) {
 +        SDL_Event event;
 +
 +        vp->allocated  = 0;
 +        vp->reallocate = 0;
 +        vp->width = src_frame->width;
 +        vp->height = src_frame->height;
 +
 +        /* 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 && !is->abort_request) {
 +                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 } };
 +
 +        /* 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,
 +                        src_frame->format, vp->width, vp->height);
 +#else
 +        av_opt_get_int(sws_opts, "sws_flags", 0, &sws_flags);
 +        is->img_convert_ctx = sws_getCachedContext(is->img_convert_ctx,
 +            vp->width, vp->height, src_frame->format, vp->width, vp->height,
 +            AV_PIX_FMT_YUV420P, sws_flags, NULL, NULL, NULL);
 +        if (!is->img_convert_ctx) {
 +            av_log(NULL, AV_LOG_FATAL, "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
 +        /* workaround SDL PITCH_WORKAROUND */
 +        duplicate_right_border_pixels(vp->bmp);
 +        /* update the bitmap content */
 +        SDL_UnlockYUVOverlay(vp->bmp);
 +
 +        vp->pts = pts;
 +        vp->duration = duration;
 +        vp->pos = pos;
 +        vp->serial = serial;
 +
 +        /* now we can update the picture count */
 +        frame_queue_push(&is->pictq);
 +    }
 +    return 0;
 +}
 +
 +static int get_video_frame(VideoState *is, AVFrame *frame)
 +{
 +    int got_picture;
 +
 +    if ((got_picture = decoder_decode_frame(&is->viddec, frame, NULL)) < 0)
 +        return -1;
 +
 +    if (got_picture) {
 +        double dpts = NAN;
 +
 +        if (frame->pts != AV_NOPTS_VALUE)
 +            dpts = av_q2d(is->video_st->time_base) * frame->pts;
 +
 +        frame->sample_aspect_ratio = av_guess_sample_aspect_ratio(is->ic, is->video_st, frame);
 +
 +        if (framedrop>0 || (framedrop && get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER)) {
 +            if (frame->pts != AV_NOPTS_VALUE) {
 +                double diff = dpts - get_master_clock(is);
 +                if (!isnan(diff) && fabs(diff) < AV_NOSYNC_THRESHOLD &&
 +                    diff - is->frame_last_filter_delay < 0 &&
 +                    is->viddec.pkt_serial == is->vidclk.serial &&
 +                    is->videoq.nb_packets) {
 +                    is->frame_drops_early++;
 +                    av_frame_unref(frame);
 +                    got_picture = 0;
 +                }
 +            }
 +        }
 +    }
 +
 +    return got_picture;
 +}
 +
 +#if CONFIG_AVFILTER
 +static int configure_filtergraph(AVFilterGraph *graph, const char *filtergraph,
 +                                 AVFilterContext *source_ctx, AVFilterContext *sink_ctx)
 +{
 +    int ret, i;
 +    int nb_filters = graph->nb_filters;
 +    AVFilterInOut *outputs = NULL, *inputs = NULL;
 +
 +    if (filtergraph) {
 +        outputs = avfilter_inout_alloc();
 +        inputs  = avfilter_inout_alloc();
 +        if (!outputs || !inputs) {
 +            ret = AVERROR(ENOMEM);
 +            goto fail;
 +        }
 +
 +        outputs->name       = av_strdup("in");
 +        outputs->filter_ctx = source_ctx;
 +        outputs->pad_idx    = 0;
 +        outputs->next       = NULL;
 +
 +        inputs->name        = av_strdup("out");
 +        inputs->filter_ctx  = sink_ctx;
 +        inputs->pad_idx     = 0;
 +        inputs->next        = NULL;
 +
 +        if ((ret = avfilter_graph_parse_ptr(graph, filtergraph, &inputs, &outputs, NULL)) < 0)
 +            goto fail;
 +    } else {
 +        if ((ret = avfilter_link(source_ctx, 0, sink_ctx, 0)) < 0)
 +            goto fail;
 +    }
 +
 +    /* Reorder the filters to ensure that inputs of the custom filters are merged first */
 +    for (i = 0; i < graph->nb_filters - nb_filters; i++)
 +        FFSWAP(AVFilterContext*, graph->filters[i], graph->filters[i + nb_filters]);
 +
 +    ret = avfilter_graph_config(graph, NULL);
 +fail:
 +    avfilter_inout_free(&outputs);
 +    avfilter_inout_free(&inputs);
 +    return ret;
 +}
 +
 +static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const char *vfilters, AVFrame *frame)
 +{
 +    static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE };
 +    char sws_flags_str[128];
 +    char buffersrc_args[256];
 +    int ret;
 +    AVFilterContext *filt_src = NULL, *filt_out = NULL, *last_filter = NULL;
 +    AVCodecContext *codec = is->video_st->codec;
 +    AVRational fr = av_guess_frame_rate(is->ic, is->video_st, NULL);
 +
 +    av_opt_get_int(sws_opts, "sws_flags", 0, &sws_flags);
 +    snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%"PRId64, sws_flags);
 +    graph->scale_sws_opts = av_strdup(sws_flags_str);
 +
 +    snprintf(buffersrc_args, sizeof(buffersrc_args),
 +             "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d",
 +             frame->width, frame->height, frame->format,
 +             is->video_st->time_base.num, is->video_st->time_base.den,
 +             codec->sample_aspect_ratio.num, FFMAX(codec->sample_aspect_ratio.den, 1));
 +    if (fr.num && fr.den)
 +        av_strlcatf(buffersrc_args, sizeof(buffersrc_args), ":frame_rate=%d/%d", fr.num, fr.den);
 +
 +    if ((ret = avfilter_graph_create_filter(&filt_src,
 +                                            avfilter_get_by_name("buffer"),
 +                                            "ffplay_buffer", buffersrc_args, NULL,
 +                                            graph)) < 0)
 +        goto fail;
 +
 +    ret = avfilter_graph_create_filter(&filt_out,
 +                                       avfilter_get_by_name("buffersink"),
 +                                       "ffplay_buffersink", NULL, NULL, graph);
 +    if (ret < 0)
 +        goto fail;
 +
 +    if ((ret = av_opt_set_int_list(filt_out, "pix_fmts", pix_fmts,  AV_PIX_FMT_NONE, AV_OPT_SEARCH_CHILDREN)) < 0)
 +        goto fail;
 +
 +    last_filter = filt_out;
 +
 +/* Note: this macro adds a filter before the lastly added filter, so the
 + * processing order of the filters is in reverse */
 +#define INSERT_FILT(name, arg) do {                                         \
 +    AVFilterContext *filt_ctx;                                              \
 +                                                                            \
 +    ret = avfilter_graph_create_filter(&filt_ctx,                           \
 +                                       avfilter_get_by_name(name),          \
 +                                       "ffplay_" name, arg, NULL, graph);   \
 +    if (ret < 0)                                                            \
 +        goto fail;                                                          \
 +                                                                            \
 +    ret = avfilter_link(filt_ctx, 0, last_filter, 0);                       \
 +    if (ret < 0)                                                            \
 +        goto fail;                                                          \
 +                                                                            \
 +    last_filter = filt_ctx;                                                 \
 +} while (0)
 +
 +    /* SDL YUV code is not handling odd width/height for some driver
 +     * combinations, therefore we crop the picture to an even width/height. */
 +    INSERT_FILT("crop", "floor(in_w/2)*2:floor(in_h/2)*2");
 +
 +    if (autorotate) {
 +        AVDictionaryEntry *rotate_tag = av_dict_get(is->video_st->metadata, "rotate", NULL, 0);
 +        if (rotate_tag && *rotate_tag->value && strcmp(rotate_tag->value, "0")) {
 +            if (!strcmp(rotate_tag->value, "90")) {
 +                INSERT_FILT("transpose", "clock");
 +            } else if (!strcmp(rotate_tag->value, "180")) {
 +                INSERT_FILT("hflip", NULL);
 +                INSERT_FILT("vflip", NULL);
 +            } else if (!strcmp(rotate_tag->value, "270")) {
 +                INSERT_FILT("transpose", "cclock");
 +            } else {
 +                char rotate_buf[64];
 +                snprintf(rotate_buf, sizeof(rotate_buf), "%s*PI/180", rotate_tag->value);
 +                INSERT_FILT("rotate", rotate_buf);
 +            }
 +        }
 +    }
 +
 +    if ((ret = configure_filtergraph(graph, vfilters, filt_src, last_filter)) < 0)
 +        goto fail;
 +
 +    is->in_video_filter  = filt_src;
 +    is->out_video_filter = filt_out;
 +
 +fail:
 +    return ret;
 +}
 +
 +static int configure_audio_filters(VideoState *is, const char *afilters, int force_output_format)
 +{
 +    static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE };
 +    int sample_rates[2] = { 0, -1 };
 +    int64_t channel_layouts[2] = { 0, -1 };
 +    int channels[2] = { 0, -1 };
 +    AVFilterContext *filt_asrc = NULL, *filt_asink = NULL;
 +    char aresample_swr_opts[512] = "";
 +    AVDictionaryEntry *e = NULL;
 +    char asrc_args[256];
 +    int ret;
 +
 +    avfilter_graph_free(&is->agraph);
 +    if (!(is->agraph = avfilter_graph_alloc()))
 +        return AVERROR(ENOMEM);
 +
 +    while ((e = av_dict_get(swr_opts, "", e, AV_DICT_IGNORE_SUFFIX)))
 +        av_strlcatf(aresample_swr_opts, sizeof(aresample_swr_opts), "%s=%s:", e->key, e->value);
 +    if (strlen(aresample_swr_opts))
 +        aresample_swr_opts[strlen(aresample_swr_opts)-1] = '\0';
 +    av_opt_set(is->agraph, "aresample_swr_opts", aresample_swr_opts, 0);
 +
 +    ret = snprintf(asrc_args, sizeof(asrc_args),
 +                   "sample_rate=%d:sample_fmt=%s:channels=%d:time_base=%d/%d",
 +                   is->audio_filter_src.freq, av_get_sample_fmt_name(is->audio_filter_src.fmt),
 +                   is->audio_filter_src.channels,
 +                   1, is->audio_filter_src.freq);
 +    if (is->audio_filter_src.channel_layout)
 +        snprintf(asrc_args + ret, sizeof(asrc_args) - ret,
 +                 ":channel_layout=0x%"PRIx64,  is->audio_filter_src.channel_layout);
 +
 +    ret = avfilter_graph_create_filter(&filt_asrc,
 +                                       avfilter_get_by_name("abuffer"), "ffplay_abuffer",
 +                                       asrc_args, NULL, is->agraph);
 +    if (ret < 0)
 +        goto end;
 +
 +
 +    ret = avfilter_graph_create_filter(&filt_asink,
 +                                       avfilter_get_by_name("abuffersink"), "ffplay_abuffersink",
 +                                       NULL, NULL, is->agraph);
 +    if (ret < 0)
 +        goto end;
 +
 +    if ((ret = av_opt_set_int_list(filt_asink, "sample_fmts", sample_fmts,  AV_SAMPLE_FMT_NONE, AV_OPT_SEARCH_CHILDREN)) < 0)
 +        goto end;
 +    if ((ret = av_opt_set_int(filt_asink, "all_channel_counts", 1, AV_OPT_SEARCH_CHILDREN)) < 0)
 +        goto end;
 +
 +    if (force_output_format) {
 +        channel_layouts[0] = is->audio_tgt.channel_layout;
 +        channels       [0] = is->audio_tgt.channels;
 +        sample_rates   [0] = is->audio_tgt.freq;
 +        if ((ret = av_opt_set_int(filt_asink, "all_channel_counts", 0, AV_OPT_SEARCH_CHILDREN)) < 0)
 +            goto end;
 +        if ((ret = av_opt_set_int_list(filt_asink, "channel_layouts", channel_layouts,  -1, AV_OPT_SEARCH_CHILDREN)) < 0)
 +            goto end;
 +        if ((ret = av_opt_set_int_list(filt_asink, "channel_counts" , channels       ,  -1, AV_OPT_SEARCH_CHILDREN)) < 0)
 +            goto end;
 +        if ((ret = av_opt_set_int_list(filt_asink, "sample_rates"   , sample_rates   ,  -1, AV_OPT_SEARCH_CHILDREN)) < 0)
 +            goto end;
 +    }
 +
 +
 +    if ((ret = configure_filtergraph(is->agraph, afilters, filt_asrc, filt_asink)) < 0)
 +        goto end;
 +
 +    is->in_audio_filter  = filt_asrc;
 +    is->out_audio_filter = filt_asink;
 +
 +end:
 +    if (ret < 0)
 +        avfilter_graph_free(&is->agraph);
 +    return ret;
 +}
 +#endif  /* CONFIG_AVFILTER */
 +
 +static int audio_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    AVFrame *frame = av_frame_alloc();
 +    Frame *af;
 +#if CONFIG_AVFILTER
 +    int last_serial = -1;
 +    int64_t dec_channel_layout;
 +    int reconfigure;
 +#endif
 +    int got_frame = 0;
 +    AVRational tb;
 +    int ret = 0;
 +
 +    if (!frame)
 +        return AVERROR(ENOMEM);
 +
 +    do {
 +        if ((got_frame = decoder_decode_frame(&is->auddec, frame, NULL)) < 0)
 +            goto the_end;
 +
 +        if (got_frame) {
 +                tb = (AVRational){1, frame->sample_rate};
 +
 +#if CONFIG_AVFILTER
 +                dec_channel_layout = get_valid_channel_layout(frame->channel_layout, av_frame_get_channels(frame));
 +
 +                reconfigure =
 +                    cmp_audio_fmts(is->audio_filter_src.fmt, is->audio_filter_src.channels,
 +                                   frame->format, av_frame_get_channels(frame))    ||
 +                    is->audio_filter_src.channel_layout != dec_channel_layout ||
 +                    is->audio_filter_src.freq           != frame->sample_rate ||
 +                    is->auddec.pkt_serial               != last_serial;
 +
 +                if (reconfigure) {
 +                    char buf1[1024], buf2[1024];
 +                    av_get_channel_layout_string(buf1, sizeof(buf1), -1, is->audio_filter_src.channel_layout);
 +                    av_get_channel_layout_string(buf2, sizeof(buf2), -1, dec_channel_layout);
 +                    av_log(NULL, AV_LOG_DEBUG,
 +                           "Audio frame changed from rate:%d ch:%d fmt:%s layout:%s serial:%d to rate:%d ch:%d fmt:%s layout:%s serial:%d\n",
 +                           is->audio_filter_src.freq, is->audio_filter_src.channels, av_get_sample_fmt_name(is->audio_filter_src.fmt), buf1, last_serial,
 +                           frame->sample_rate, av_frame_get_channels(frame), av_get_sample_fmt_name(frame->format), buf2, is->auddec.pkt_serial);
 +
 +                    is->audio_filter_src.fmt            = frame->format;
 +                    is->audio_filter_src.channels       = av_frame_get_channels(frame);
 +                    is->audio_filter_src.channel_layout = dec_channel_layout;
 +                    is->audio_filter_src.freq           = frame->sample_rate;
 +                    last_serial                         = is->auddec.pkt_serial;
 +
 +                    if ((ret = configure_audio_filters(is, afilters, 1)) < 0)
 +                        goto the_end;
 +                }
 +
 +            if ((ret = av_buffersrc_add_frame(is->in_audio_filter, frame)) < 0)
 +                goto the_end;
 +
 +            while ((ret = av_buffersink_get_frame_flags(is->out_audio_filter, frame, 0)) >= 0) {
 +                tb = is->out_audio_filter->inputs[0]->time_base;
 +#endif
 +                if (!(af = frame_queue_peek_writable(&is->sampq)))
 +                    goto the_end;
 +
 +                af->pts = (frame->pts == AV_NOPTS_VALUE) ? NAN : frame->pts * av_q2d(tb);
 +                af->pos = av_frame_get_pkt_pos(frame);
 +                af->serial = is->auddec.pkt_serial;
 +                af->duration = av_q2d((AVRational){frame->nb_samples, frame->sample_rate});
 +
 +                av_frame_move_ref(af->frame, frame);
 +                frame_queue_push(&is->sampq);
 +
 +#if CONFIG_AVFILTER
 +                if (is->audioq.serial != is->auddec.pkt_serial)
 +                    break;
 +            }
 +            if (ret == AVERROR_EOF)
 +                is->auddec.finished = is->auddec.pkt_serial;
 +#endif
 +        }
 +    } while (ret >= 0 || ret == AVERROR(EAGAIN) || ret == AVERROR_EOF);
 + the_end:
 +#if CONFIG_AVFILTER
 +    avfilter_graph_free(&is->agraph);
 +#endif
 +    av_frame_free(&frame);
 +    return ret;
 +}
 +
 +static void decoder_start(Decoder *d, int (*fn)(void *), void *arg)
 +{
 +    packet_queue_start(d->queue);
 +    d->decoder_tid = SDL_CreateThread(fn, arg);
 +}
 +
 +static int video_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    AVFrame *frame = av_frame_alloc();
 +    double pts;
 +    double duration;
 +    int ret;
 +    AVRational tb = is->video_st->time_base;
 +    AVRational frame_rate = av_guess_frame_rate(is->ic, is->video_st, NULL);
 +
 +#if CONFIG_AVFILTER
 +    AVFilterGraph *graph = avfilter_graph_alloc();
 +    AVFilterContext *filt_out = NULL, *filt_in = NULL;
 +    int last_w = 0;
 +    int last_h = 0;
 +    enum AVPixelFormat last_format = -2;
 +    int last_serial = -1;
 +    int last_vfilter_idx = 0;
 +    if (!graph)
 +        return AVERROR(ENOMEM);
 +
 +#endif
 +
 +    if (!frame)
 +        return AVERROR(ENOMEM);
 +
 +    for (;;) {
 +        ret = get_video_frame(is, frame);
 +        if (ret < 0)
 +            goto the_end;
 +        if (!ret)
 +            continue;
 +
 +#if CONFIG_AVFILTER
 +        if (   last_w != frame->width
 +            || last_h != frame->height
 +            || last_format != frame->format
 +            || last_serial != is->viddec.pkt_serial
 +            || last_vfilter_idx != is->vfilter_idx) {
 +            av_log(NULL, AV_LOG_DEBUG,
 +                   "Video frame changed from size:%dx%d format:%s serial:%d to size:%dx%d format:%s serial:%d\n",
 +                   last_w, last_h,
 +                   (const char *)av_x_if_null(av_get_pix_fmt_name(last_format), "none"), last_serial,
 +                   frame->width, frame->height,
 +                   (const char *)av_x_if_null(av_get_pix_fmt_name(frame->format), "none"), is->viddec.pkt_serial);
 +            avfilter_graph_free(&graph);
 +            graph = avfilter_graph_alloc();
 +            if ((ret = configure_video_filters(graph, is, vfilters_list ? vfilters_list[is->vfilter_idx] : NULL, frame)) < 0) {
 +                SDL_Event event;
 +                event.type = FF_QUIT_EVENT;
 +                event.user.data1 = is;
 +                SDL_PushEvent(&event);
 +                goto the_end;
 +            }
 +            filt_in  = is->in_video_filter;
 +            filt_out = is->out_video_filter;
 +            last_w = frame->width;
 +            last_h = frame->height;
 +            last_format = frame->format;
 +            last_serial = is->viddec.pkt_serial;
 +            last_vfilter_idx = is->vfilter_idx;
 +            frame_rate = filt_out->inputs[0]->frame_rate;
 +        }
 +
 +        ret = av_buffersrc_add_frame(filt_in, frame);
 +        if (ret < 0)
 +            goto the_end;
 +
 +        while (ret >= 0) {
 +            is->frame_last_returned_time = av_gettime_relative() / 1000000.0;
 +
 +            ret = av_buffersink_get_frame_flags(filt_out, frame, 0);
 +            if (ret < 0) {
 +                if (ret == AVERROR_EOF)
 +                    is->viddec.finished = is->viddec.pkt_serial;
 +                ret = 0;
 +                break;
 +            }
 +
 +            is->frame_last_filter_delay = av_gettime_relative() / 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;
 +            tb = filt_out->inputs[0]->time_base;
 +#endif
 +            duration = (frame_rate.num && frame_rate.den ? av_q2d((AVRational){frame_rate.den, frame_rate.num}) : 0);
 +            pts = (frame->pts == AV_NOPTS_VALUE) ? NAN : frame->pts * av_q2d(tb);
 +            ret = queue_picture(is, frame, pts, duration, av_frame_get_pkt_pos(frame), is->viddec.pkt_serial);
 +            av_frame_unref(frame);
 +#if CONFIG_AVFILTER
 +        }
 +#endif
 +
 +        if (ret < 0)
 +            goto the_end;
 +    }
 + the_end:
 +#if CONFIG_AVFILTER
 +    avfilter_graph_free(&graph);
 +#endif
 +    av_frame_free(&frame);
 +    return 0;
 +}
 +
 +static int subtitle_thread(void *arg)
 +{
 +    VideoState *is = arg;
 +    Frame *sp;
 +    int got_subtitle;
 +    double pts;
 +    int i, j;
 +    int r, g, b, y, u, v, a;
 +
 +    for (;;) {
 +        if (!(sp = frame_queue_peek_writable(&is->subpq)))
 +            return 0;
 +
 +        if ((got_subtitle = decoder_decode_frame(&is->subdec, NULL, &sp->sub)) < 0)
 +            break;
 +
 +        pts = 0;
 +
 +        if (got_subtitle && sp->sub.format == 0) {
 +            if (sp->sub.pts != AV_NOPTS_VALUE)
 +                pts = sp->sub.pts / (double)AV_TIME_BASE;
 +            sp->pts = pts;
 +            sp->serial = is->subdec.pkt_serial;
 +
 +            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 */
 +            frame_queue_push(&is->subpq);
 +        } else if (got_subtitle) {
 +            avsubtitle_free(&sp->sub);
 +        }
 +    }
 +    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 (get_master_sync_type(is) != AV_SYNC_AUDIO_MASTER) {
 +        double diff, avg_diff;
 +        int min_nb_samples, max_nb_samples;
 +
 +        diff = get_clock(&is->audclk) - get_master_clock(is);
 +
 +        if (!isnan(diff) && fabs(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_log(NULL, AV_LOG_TRACE, "diff=%f adiff=%f sample_diff=%d apts=%0.3f %f\n",
 +                        diff, avg_diff, wanted_nb_samples - nb_samples,
 +                        is->audio_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 return its uncompressed size.
 + *
 + * The processed audio frame is decoded, converted if required, and
 + * stored in is->audio_buf, with size in bytes given by the return
 + * value.
 + */
 +static int audio_decode_frame(VideoState *is)
 +{
 +    int data_size, resampled_data_size;
 +    int64_t dec_channel_layout;
 +    av_unused double audio_clock0;
 +    int wanted_nb_samples;
 +    Frame *af;
 +
 +    if (is->paused)
 +        return -1;
 +
 +    do {
 +        if (!(af = frame_queue_peek_readable(&is->sampq)))
 +            return -1;
 +        frame_queue_next(&is->sampq);
 +    } while (af->serial != is->audioq.serial);
 +
 +    data_size = av_samples_get_buffer_size(NULL, av_frame_get_channels(af->frame),
 +                                           af->frame->nb_samples,
 +                                           af->frame->format, 1);
 +
 +    dec_channel_layout =
 +        (af->frame->channel_layout && av_frame_get_channels(af->frame) == av_get_channel_layout_nb_channels(af->frame->channel_layout)) ?
 +        af->frame->channel_layout : av_get_default_channel_layout(av_frame_get_channels(af->frame));
 +    wanted_nb_samples = synchronize_audio(is, af->frame->nb_samples);
 +
 +    if (af->frame->format        != is->audio_src.fmt            ||
 +        dec_channel_layout       != is->audio_src.channel_layout ||
 +        af->frame->sample_rate   != is->audio_src.freq           ||
 +        (wanted_nb_samples       != af->frame->nb_samples && !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,           af->frame->format, af->frame->sample_rate,
 +                                         0, NULL);
 +        if (!is->swr_ctx || swr_init(is->swr_ctx) < 0) {
 +            av_log(NULL, AV_LOG_ERROR,
 +                   "Cannot create sample rate converter for conversion of %d Hz %s %d channels to %d Hz %s %d channels!\n",
 +                    af->frame->sample_rate, av_get_sample_fmt_name(af->frame->format), av_frame_get_channels(af->frame),
 +                    is->audio_tgt.freq, av_get_sample_fmt_name(is->audio_tgt.fmt), is->audio_tgt.channels);
 +            swr_free(&is->swr_ctx);
 +            return -1;
 +        }
 +        is->audio_src.channel_layout = dec_channel_layout;
 +        is->audio_src.channels       = av_frame_get_channels(af->frame);
 +        is->audio_src.freq = af->frame->sample_rate;
 +        is->audio_src.fmt = af->frame->format;
 +    }
 +
 +    if (is->swr_ctx) {
 +        const uint8_t **in = (const uint8_t **)af->frame->extended_data;
 +        uint8_t **out = &is->audio_buf1;
 +        int out_count = (int64_t)wanted_nb_samples * is->audio_tgt.freq / af->frame->sample_rate + 256;
 +        int out_size  = av_samples_get_buffer_size(NULL, is->audio_tgt.channels, out_count, is->audio_tgt.fmt, 0);
 +        int len2;
 +        if (out_size < 0) {
 +            av_log(NULL, AV_LOG_ERROR, "av_samples_get_buffer_size() failed\n");
 +            return -1;
 +        }
 +        if (wanted_nb_samples != af->frame->nb_samples) {
 +            if (swr_set_compensation(is->swr_ctx, (wanted_nb_samples - af->frame->nb_samples) * is->audio_tgt.freq / af->frame->sample_rate,
 +                                        wanted_nb_samples * is->audio_tgt.freq / af->frame->sample_rate) < 0) {
 +                av_log(NULL, AV_LOG_ERROR, "swr_set_compensation() failed\n");
 +                return -1;
 +            }
 +        }
 +        av_fast_malloc(&is->audio_buf1, &is->audio_buf1_size, out_size);
 +        if (!is->audio_buf1)
 +            return AVERROR(ENOMEM);
 +        len2 = swr_convert(is->swr_ctx, out, out_count, in, af->frame->nb_samples);
 +        if (len2 < 0) {
 +            av_log(NULL, AV_LOG_ERROR, "swr_convert() failed\n");
 +            return -1;
 +        }
 +        if (len2 == out_count) {
 +            av_log(NULL, AV_LOG_WARNING, "audio buffer is probably too small\n");
 +            if (swr_init(is->swr_ctx) < 0)
 +                swr_free(&is->swr_ctx);
 +        }
 +        is->audio_buf = is->audio_buf1;
 +        resampled_data_size = len2 * is->audio_tgt.channels * av_get_bytes_per_sample(is->audio_tgt.fmt);
 +    } else {
 +        is->audio_buf = af->frame->data[0];
 +        resampled_data_size = data_size;
 +    }
 +
 +    audio_clock0 = is->audio_clock;
 +    /* update the audio clock with the pts */
 +    if (!isnan(af->pts))
 +        is->audio_clock = af->pts + (double) af->frame->nb_samples / af->frame->sample_rate;
 +    else
 +        is->audio_clock = NAN;
 +    is->audio_clock_serial = af->serial;
 +#ifdef DEBUG
 +    {
 +        static double last_clock;
 +        printf("audio: delay=%0.3f clock=%0.3f clock0=%0.3f\n",
 +               is->audio_clock - last_clock,
 +               is->audio_clock, audio_clock0);
 +        last_clock = is->audio_clock;
 +    }
 +#endif
 +    return resampled_data_size;
 +}
 +
 +/* prepare a new audio buffer */
 +static void sdl_audio_callback(void *opaque, Uint8 *stream, int len)
 +{
 +    VideoState *is = opaque;
 +    int audio_size, len1;
 +
 +    audio_callback_time = av_gettime_relative();
 +
 +    while (len > 0) {
 +        if (is->audio_buf_index >= is->audio_buf_size) {
 +           audio_size = audio_decode_frame(is);
 +           if (audio_size < 0) {
 +                /* if error, just output silence */
 +               is->audio_buf      = is->silence_buf;
 +               is->audio_buf_size = sizeof(is->silence_buf) / is->audio_tgt.frame_size * is->audio_tgt.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;
 +    }
 +    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. */
 +    if (!isnan(is->audio_clock)) {
 +        set_clock_at(&is->audclk, is->audio_clock - (double)(2 * is->audio_hw_buf_size + is->audio_write_buf_size) / is->audio_tgt.bytes_per_sec, is->audio_clock_serial, audio_callback_time / 1000000.0);
 +        sync_clock_to_slave(&is->extclk, &is->audclk);
 +    }
 +}
 +
 +static int audio_open(void *opaque, int64_t wanted_channel_layout, int wanted_nb_channels, int wanted_sample_rate, struct AudioParams *audio_hw_params)
 +{
 +    SDL_AudioSpec wanted_spec, spec;
 +    const char *env;
 +    static const int next_nb_channels[] = {0, 0, 1, 6, 2, 6, 4, 6};
 +    static const int next_sample_rates[] = {0, 44100, 48000, 96000, 192000};
 +    int next_sample_rate_idx = FF_ARRAY_ELEMS(next_sample_rates) - 1;
 +
 +    env = SDL_getenv("SDL_AUDIO_CHANNELS");
 +    if (env) {
 +        wanted_nb_channels = atoi(env);
 +        wanted_channel_layout = av_get_default_channel_layout(wanted_nb_channels);
 +    }
 +    if (!wanted_channel_layout || wanted_nb_channels != av_get_channel_layout_nb_channels(wanted_channel_layout)) {
 +        wanted_channel_layout = av_get_default_channel_layout(wanted_nb_channels);
 +        wanted_channel_layout &= ~AV_CH_LAYOUT_STEREO_DOWNMIX;
 +    }
 +    wanted_nb_channels = av_get_channel_layout_nb_channels(wanted_channel_layout);
 +    wanted_spec.channels = wanted_nb_channels;
 +    wanted_spec.freq = wanted_sample_rate;
 +    if (wanted_spec.freq <= 0 || wanted_spec.channels <= 0) {
 +        av_log(NULL, AV_LOG_ERROR, "Invalid sample rate or channel count!\n");
 +        return -1;
 +    }
 +    while (next_sample_rate_idx && next_sample_rates[next_sample_rate_idx] >= wanted_spec.freq)
 +        next_sample_rate_idx--;
 +    wanted_spec.format = AUDIO_S16SYS;
 +    wanted_spec.silence = 0;
 +    wanted_spec.samples = FFMAX(SDL_AUDIO_MIN_BUFFER_SIZE, 2 << av_log2(wanted_spec.freq / SDL_AUDIO_MAX_CALLBACKS_PER_SEC));
 +    wanted_spec.callback = sdl_audio_callback;
 +    wanted_spec.userdata = opaque;
 +    while (SDL_OpenAudio(&wanted_spec, &spec) < 0) {
 +        av_log(NULL, AV_LOG_WARNING, "SDL_OpenAudio (%d channels, %d Hz): %s\n",
 +               wanted_spec.channels, wanted_spec.freq, SDL_GetError());
 +        wanted_spec.channels = next_nb_channels[FFMIN(7, wanted_spec.channels)];
 +        if (!wanted_spec.channels) {
 +            wanted_spec.freq = next_sample_rates[next_sample_rate_idx--];
 +            wanted_spec.channels = wanted_nb_channels;
 +            if (!wanted_spec.freq) {
 +                av_log(NULL, AV_LOG_ERROR,
 +                       "No more combinations to try, audio open failed\n");
 +                return -1;
 +            }
 +        }
 +        wanted_channel_layout = av_get_default_channel_layout(wanted_spec.channels);
 +    }
 +    if (spec.format != AUDIO_S16SYS) {
 +        av_log(NULL, AV_LOG_ERROR,
 +               "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) {
 +            av_log(NULL, AV_LOG_ERROR,
 +                   "SDL advised channel count %d is not supported!\n", spec.channels);
 +            return -1;
 +        }
 +    }
 +
 +    audio_hw_params->fmt = AV_SAMPLE_FMT_S16;
 +    audio_hw_params->freq = spec.freq;
 +    audio_hw_params->channel_layout = wanted_channel_layout;
 +    audio_hw_params->channels =  spec.channels;
 +    audio_hw_params->frame_size = av_samples_get_buffer_size(NULL, audio_hw_params->channels, 1, audio_hw_params->fmt, 1);
 +    audio_hw_params->bytes_per_sec = av_samples_get_buffer_size(NULL, audio_hw_params->channels, audio_hw_params->freq, audio_hw_params->fmt, 1);
 +    if (audio_hw_params->bytes_per_sec <= 0 || audio_hw_params->frame_size <= 0) {
 +        av_log(NULL, AV_LOG_ERROR, "av_samples_get_buffer_size failed\n");
 +        return -1;
 +    }
 +    return spec.size;
 +}
 +
 +/* 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;
 +    const char *forced_codec_name = NULL;
 +    AVDictionary *opts;
 +    AVDictionaryEntry *t = NULL;
 +    int sample_rate, nb_channels;
 +    int64_t channel_layout;
 +    int ret = 0;
 +    int stream_lowres = lowres;
 +
 +    if (stream_index < 0 || stream_index >= ic->nb_streams)
 +        return -1;
 +    avctx = ic->streams[stream_index]->codec;
 +
 +    codec = avcodec_find_decoder(avctx->codec_id);
 +
 +    switch(avctx->codec_type){
 +        case AVMEDIA_TYPE_AUDIO   : is->last_audio_stream    = stream_index; forced_codec_name =    audio_codec_name; break;
 +        case AVMEDIA_TYPE_SUBTITLE: is->last_subtitle_stream = stream_index; forced_codec_name = subtitle_codec_name; break;
 +        case AVMEDIA_TYPE_VIDEO   : is->last_video_stream    = stream_index; forced_codec_name =    video_codec_name; break;
 +    }
 +    if (forced_codec_name)
 +        codec = avcodec_find_decoder_by_name(forced_codec_name);
 +    if (!codec) {
 +        if (forced_codec_name) av_log(NULL, AV_LOG_WARNING,
 +                                      "No codec could be found with name '%s'\n", forced_codec_name);
 +        else                   av_log(NULL, AV_LOG_WARNING,
 +                                      "No codec could be found with id %d\n", avctx->codec_id);
 +        return -1;
 +    }
 +
 +    avctx->codec_id = codec->id;
 +    if(stream_lowres > av_codec_get_max_lowres(codec)){
 +        av_log(avctx, AV_LOG_WARNING, "The maximum value for lowres supported by the decoder is %d\n",
 +                av_codec_get_max_lowres(codec));
 +        stream_lowres = av_codec_get_max_lowres(codec);
 +    }
 +    av_codec_set_lowres(avctx, stream_lowres);
 +
 +    if(stream_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;
 +
 +    opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index], codec);
 +    if (!av_dict_get(opts, "threads", NULL, 0))
 +        av_dict_set(&opts, "threads", "auto", 0);
 +    if (stream_lowres)
 +        av_dict_set_int(&opts, "lowres", stream_lowres, 0);
 +    if (avctx->codec_type == AVMEDIA_TYPE_VIDEO || avctx->codec_type == AVMEDIA_TYPE_AUDIO)
 +        av_dict_set(&opts, "refcounted_frames", "1", 0);
 +    if ((ret = avcodec_open2(avctx, codec, &opts)) < 0) {
 +        goto fail;
 +    }
 +    if ((t = av_dict_get(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->eof = 0;
 +    ic->streams[stream_index]->discard = AVDISCARD_DEFAULT;
 +    switch (avctx->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +#if CONFIG_AVFILTER
 +        {
 +            AVFilterLink *link;
 +
 +            is->audio_filter_src.freq           = avctx->sample_rate;
 +            is->audio_filter_src.channels       = avctx->channels;
 +            is->audio_filter_src.channel_layout = get_valid_channel_layout(avctx->channel_layout, avctx->channels);
 +            is->audio_filter_src.fmt            = avctx->sample_fmt;
 +            if ((ret = configure_audio_filters(is, afilters, 0)) < 0)
 +                goto fail;
 +            link = is->out_audio_filter->inputs[0];
 +            sample_rate    = link->sample_rate;
 +            nb_channels    = link->channels;
 +            channel_layout = link->channel_layout;
 +        }
 +#else
 +        sample_rate    = avctx->sample_rate;
 +        nb_channels    = avctx->channels;
 +        channel_layout = avctx->channel_layout;
 +#endif
 +
 +        /* prepare audio output */
 +        if ((ret = audio_open(is, channel_layout, nb_channels, sample_rate, &is->audio_tgt)) < 0)
 +            goto fail;
 +        is->audio_hw_buf_size = ret;
 +        is->audio_src = is->audio_tgt;
 +        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 = (double)(is->audio_hw_buf_size) / is->audio_tgt.bytes_per_sec;
 +
 +        is->audio_stream = stream_index;
 +        is->audio_st = ic->streams[stream_index];
 +
 +        decoder_init(&is->auddec, avctx, &is->audioq, is->continue_read_thread);
 +        if ((is->ic->iformat->flags & (AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK)) && !is->ic->iformat->read_seek) {
 +            is->auddec.start_pts = is->audio_st->start_time;
 +            is->auddec.start_pts_tb = is->audio_st->time_base;
 +        }
 +        decoder_start(&is->auddec, audio_thread, is);
 +        SDL_PauseAudio(0);
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        is->video_stream = stream_index;
 +        is->video_st = ic->streams[stream_index];
 +
 +        decoder_init(&is->viddec, avctx, &is->videoq, is->continue_read_thread);
 +        decoder_start(&is->viddec, video_thread, is);
 +        is->queue_attachments_req = 1;
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        is->subtitle_stream = stream_index;
 +        is->subtitle_st = ic->streams[stream_index];
 +
 +        decoder_init(&is->subdec, avctx, &is->subtitleq, is->continue_read_thread);
 +        decoder_start(&is->subdec, subtitle_thread, is);
 +        break;
 +    default:
 +        break;
 +    }
 +
 +fail:
 +    av_dict_free(&opts);
 +
 +    return ret;
 +}
 +
 +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:
 +        decoder_abort(&is->auddec, &is->sampq);
 +        SDL_CloseAudio();
 +        decoder_destroy(&is->auddec);
 +        swr_free(&is->swr_ctx);
 +        av_freep(&is->audio_buf1);
 +        is->audio_buf1_size = 0;
 +        is->audio_buf = NULL;
 +
 +        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:
 +        decoder_abort(&is->viddec, &is->pictq);
 +        decoder_destroy(&is->viddec);
 +        break;
 +    case AVMEDIA_TYPE_SUBTITLE:
 +        decoder_abort(&is->subdec, &is->subpq);
 +        decoder_destroy(&is->subdec);
 +        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;
 +}
 +
 +static int is_realtime(AVFormatContext *s)
 +{
 +    if(   !strcmp(s->iformat->name, "rtp")
 +       || !strcmp(s->iformat->name, "rtsp")
 +       || !strcmp(s->iformat->name, "sdp")
 +    )
 +        return 1;
 +
 +    if(s->pb && (   !strncmp(s->filename, "rtp:", 4)
 +                 || !strncmp(s->filename, "udp:", 4)
 +                )
 +    )
 +        return 1;
 +    return 0;
 +}
 +
 +/* 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;
 +    int64_t stream_start_time;
 +    int pkt_in_play_range = 0;
 +    AVDictionaryEntry *t;
 +    AVDictionary **opts;
 +    int orig_nb_streams;
 +    SDL_mutex *wait_mutex = SDL_CreateMutex();
 +    int scan_all_pmts_set = 0;
 +    int64_t pkt_ts;
 +
 +    memset(st_index, -1, sizeof(st_index));
 +    is->last_video_stream = is->video_stream = -1;
 +    is->last_audio_stream = is->audio_stream = -1;
 +    is->last_subtitle_stream = is->subtitle_stream = -1;
 +    is->eof = 0;
 +
 +    ic = avformat_alloc_context();
 +    if (!ic) {
 +        av_log(NULL, AV_LOG_FATAL, "Could not allocate context.\n");
 +        ret = AVERROR(ENOMEM);
 +        goto fail;
 +    }
 +    ic->interrupt_callback.callback = decode_interrupt_cb;
 +    ic->interrupt_callback.opaque = is;
 +    if (!av_dict_get(format_opts, "scan_all_pmts", NULL, AV_DICT_MATCH_CASE)) {
 +        av_dict_set(&format_opts, "scan_all_pmts", "1", AV_DICT_DONT_OVERWRITE);
 +        scan_all_pmts_set = 1;
 +    }
 +    err = avformat_open_input(&ic, is->filename, is->iformat, &format_opts);
 +    if (err < 0) {
 +        print_error(is->filename, err);
 +        ret = -1;
 +        goto fail;
 +    }
 +    if (scan_all_pmts_set)
 +        av_dict_set(&format_opts, "scan_all_pmts", NULL, AV_DICT_MATCH_CASE);
 +
 +    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;
 +
 +    av_format_inject_global_side_data(ic);
 +
 +    opts = setup_find_stream_info_opts(ic, codec_opts);
 +    orig_nb_streams = ic->nb_streams;
 +
 +    err = avformat_find_stream_info(ic, opts);
 +
 +    for (i = 0; i < orig_nb_streams; i++)
 +        av_dict_free(&opts[i]);
 +    av_freep(&opts);
 +
 +    if (err < 0) {
 +        av_log(NULL, AV_LOG_WARNING,
 +               "%s: could not find codec parameters\n", is->filename);
 +        ret = -1;
 +        goto fail;
 +    }
 +
 +    if (ic->pb)
 +        ic->pb->eof_reached = 0; // FIXME hack, ffplay maybe should not use avio_feof() to test for the end
 +
 +    if (seek_by_bytes < 0)
 +        seek_by_bytes = !!(ic->iformat->flags & AVFMT_TS_DISCONT) && strcmp("ogg", ic->iformat->name);
 +
 +    is->max_frame_duration = (ic->iformat->flags & AVFMT_TS_DISCONT) ? 10.0 : 3600.0;
 +
 +    if (!window_title && (t = av_dict_get(ic->metadata, "title", NULL, 0)))
 +        window_title = av_asprintf("%s - %s", t->value, input_filename);
 +
 +    /* 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) {
 +            av_log(NULL, AV_LOG_WARNING, "%s: could not seek to position %0.3f\n",
 +                    is->filename, (double)timestamp / AV_TIME_BASE);
 +        }
 +    }
 +
 +    is->realtime = is_realtime(ic);
 +
 +    if (show_status)
 +        av_dump_format(ic, 0, is->filename, 0);
 +
 +    for (i = 0; i < ic->nb_streams; i++) {
 +        AVStream *st = ic->streams[i];
 +        enum AVMediaType type = st->codec->codec_type;
 +        st->discard = AVDISCARD_ALL;
 +        if (wanted_stream_spec[type] && st_index[type] == -1)
 +            if (avformat_match_stream_specifier(ic, st, wanted_stream_spec[type]) > 0)
 +                st_index[type] = i;
 +    }
 +    for (i = 0; i < AVMEDIA_TYPE_NB; i++) {
 +        if (wanted_stream_spec[i] && st_index[i] == -1) {
 +            av_log(NULL, AV_LOG_ERROR, "Stream specifier %s does not match any %s stream\n", wanted_stream_spec[i], av_get_media_type_string(i));
 +            st_index[i] = INT_MAX;
 +        }
 +    }
 +
 +    if (!video_disable)
 +        st_index[AVMEDIA_TYPE_VIDEO] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_VIDEO,
 +                                st_index[AVMEDIA_TYPE_VIDEO], -1, NULL, 0);
 +    if (!audio_disable)
 +        st_index[AVMEDIA_TYPE_AUDIO] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_AUDIO,
 +                                st_index[AVMEDIA_TYPE_AUDIO],
 +                                st_index[AVMEDIA_TYPE_VIDEO],
 +                                NULL, 0);
 +    if (!video_disable && !subtitle_disable)
 +        st_index[AVMEDIA_TYPE_SUBTITLE] =
 +            av_find_best_stream(ic, AVMEDIA_TYPE_SUBTITLE,
 +                                st_index[AVMEDIA_TYPE_SUBTITLE],
 +                                (st_index[AVMEDIA_TYPE_AUDIO] >= 0 ?
 +                                 st_index[AVMEDIA_TYPE_AUDIO] :
 +                                 st_index[AVMEDIA_TYPE_VIDEO]),
 +                                NULL, 0);
 +
 +    is->show_mode = show_mode;
 +    if (st_index[AVMEDIA_TYPE_VIDEO] >= 0) {
 +        AVStream *st = ic->streams[st_index[AVMEDIA_TYPE_VIDEO]];
 +        AVCodecContext *avctx = st->codec;
 +        AVRational sar = av_guess_sample_aspect_ratio(ic, st, NULL);
 +        if (avctx->width)
 +            set_default_window_size(avctx->width, avctx->height, sar);
 +    }
 +
 +    /* 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]);
 +    }
 +    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) {
 +        av_log(NULL, AV_LOG_FATAL, "Failed to open file '%s' or configure filtergraph\n",
 +               is->filename);
 +        ret = -1;
 +        goto fail;
 +    }
 +
 +    if (infinite_buffer < 0 && is->realtime)
 +        infinite_buffer = 1;
 +
 +    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) {
 +                av_log(NULL, AV_LOG_ERROR,
 +                       "%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);
 +                }
 +                if (is->seek_flags & AVSEEK_FLAG_BYTE) {
 +                   set_clock(&is->extclk, NAN, 0);
 +                } else {
 +                   set_clock(&is->extclk, seek_target / (double)AV_TIME_BASE, 0);
 +                }
 +            }
 +            is->seek_req = 0;
 +            is->queue_attachments_req = 1;
 +            is->eof = 0;
 +            if (is->paused)
 +                step_to_next_frame(is);
 +        }
 +        if (is->queue_attachments_req) {
 +            if (is->video_st && is->video_st->disposition & AV_DISPOSITION_ATTACHED_PIC) {
 +                AVPacket copy;
 +                if ((ret = av_copy_packet(&copy, &is->video_st->attached_pic)) < 0)
 +                    goto fail;
 +                packet_queue_put(&is->videoq, &copy);
 +                packet_queue_put_nullpacket(&is->videoq, is->video_stream);
 +            }
 +            is->queue_attachments_req = 0;
 +        }
 +
 +        /* if the queue are full, no need to read more */
 +        if (infinite_buffer<1 &&
 +              (is->audioq.size + is->videoq.size + is->subtitleq.size > MAX_QUEUE_SIZE
 +            || (   (is->audioq   .nb_packets > MIN_FRAMES || is->audio_stream < 0 || is->audioq.abort_request)
 +                && (is->videoq   .nb_packets > MIN_FRAMES || is->video_stream < 0 || is->videoq.abort_request
 +                    || (is->video_st->disposition & AV_DISPOSITION_ATTACHED_PIC))
 +                && (is->subtitleq.nb_packets > MIN_FRAMES || is->subtitle_stream < 0 || is->subtitleq.abort_request)))) {
 +            /* wait 10 ms */
 +            SDL_LockMutex(wait_mutex);
 +            SDL_CondWaitTimeout(is->continue_read_thread, wait_mutex, 10);
 +            SDL_UnlockMutex(wait_mutex);
 +            continue;
 +        }
 +        if (!is->paused &&
 +            (!is->audio_st || (is->auddec.finished == is->audioq.serial && frame_queue_nb_remaining(&is->sampq) == 0)) &&
 +            (!is->video_st || (is->viddec.finished == is->videoq.serial && frame_queue_nb_remaining(&is->pictq) == 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;
 +            }
 +        }
 +        ret = av_read_frame(ic, pkt);
 +        if (ret < 0) {
 +            if ((ret == AVERROR_EOF || avio_feof(ic->pb)) && !is->eof) {
 +                if (is->video_stream >= 0)
 +                    packet_queue_put_nullpacket(&is->videoq, is->video_stream);
 +                if (is->audio_stream >= 0)
 +                    packet_queue_put_nullpacket(&is->audioq, is->audio_stream);
 +                if (is->subtitle_stream >= 0)
 +                    packet_queue_put_nullpacket(&is->subtitleq, is->subtitle_stream);
 +                is->eof = 1;
 +            }
 +            if (ic->pb && ic->pb->error)
 +                break;
 +            SDL_LockMutex(wait_mutex);
 +            SDL_CondWaitTimeout(is->continue_read_thread, wait_mutex, 10);
 +            SDL_UnlockMutex(wait_mutex);
 +            continue;
 +        } else {
 +            is->eof = 0;
 +        }
 +        /* check if packet is in play range specified by user, then queue, otherwise discard */
 +        stream_start_time = ic->streams[pkt->stream_index]->start_time;
 +        pkt_ts = pkt->pts == AV_NOPTS_VALUE ? pkt->dts : pkt->pts;
 +        pkt_in_play_range = duration == AV_NOPTS_VALUE ||
 +                (pkt_ts - (stream_start_time != AV_NOPTS_VALUE ? stream_start_time : 0)) *
 +                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
 +                   && !(is->video_st->disposition & AV_DISPOSITION_ATTACHED_PIC)) {
 +            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 (ic) {
 +        avformat_close_input(&ic);
 +        is->ic = NULL;
 +    }
 +
 +    if (ret != 0) {
 +        SDL_Event event;
 +
 +        event.type = FF_QUIT_EVENT;
 +        event.user.data1 = is;
 +        SDL_PushEvent(&event);
 +    }
 +    SDL_DestroyMutex(wait_mutex);
 +    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 */
 +    if (frame_queue_init(&is->pictq, &is->videoq, VIDEO_PICTURE_QUEUE_SIZE, 1) < 0)
 +        goto fail;
 +    if (frame_queue_init(&is->subpq, &is->subtitleq, SUBPICTURE_QUEUE_SIZE, 0) < 0)
 +        goto fail;
 +    if (frame_queue_init(&is->sampq, &is->audioq, SAMPLE_QUEUE_SIZE, 1) < 0)
 +        goto fail;
 +
 +    packet_queue_init(&is->videoq);
 +    packet_queue_init(&is->audioq);
 +    packet_queue_init(&is->subtitleq);
 +
 +    is->continue_read_thread = SDL_CreateCond();
 +
 +    init_clock(&is->vidclk, &is->videoq.serial);
 +    init_clock(&is->audclk, &is->audioq.serial);
 +    init_clock(&is->extclk, &is->extclk.serial);
 +    is->audio_clock_serial = -1;
 +    is->av_sync_type = av_sync_type;
 +    is->read_tid     = SDL_CreateThread(read_thread, is);
 +    if (!is->read_tid) {
 +fail:
 +        stream_close(is);
 +        return NULL;
 +    }
 +    return is;
 +}
 +
 +static void stream_cycle_channel(VideoState *is, int codec_type)
 +{
 +    AVFormatContext *ic = is->ic;
 +    int start_index, stream_index;
 +    int old_index;
 +    AVStream *st;
 +    AVProgram *p = NULL;
 +    int nb_streams = is->ic->nb_streams;
 +
 +    if (codec_type == AVMEDIA_TYPE_VIDEO) {
 +        start_index = is->last_video_stream;
 +        old_index = is->video_stream;
 +    } else if (codec_type == AVMEDIA_TYPE_AUDIO) {
 +        start_index = is->last_audio_stream;
 +        old_index = is->audio_stream;
 +    } else {
 +        start_index = is->last_subtitle_stream;
 +        old_index = is->subtitle_stream;
 +    }
 +    stream_index = start_index;
 +
 +    if (codec_type != AVMEDIA_TYPE_VIDEO && is->video_stream != -1) {
 +        p = av_find_program_from_stream(ic, NULL, is->video_stream);
 +        if (p) {
 +            nb_streams = p->nb_stream_indexes;
 +            for (start_index = 0; start_index < nb_streams; start_index++)
 +                if (p->stream_index[start_index] == stream_index)
 +                    break;
 +            if (start_index == nb_streams)
 +                start_index = -1;
 +            stream_index = start_index;
 +        }
 +    }
 +
 +    for (;;) {
 +        if (++stream_index >= nb_streams)
 +        {
 +            if (codec_type == AVMEDIA_TYPE_SUBTITLE)
 +            {
 +                stream_index = -1;
 +                is->last_subtitle_stream = -1;
 +                goto the_end;
 +            }
 +            if (start_index == -1)
 +                return;
 +            stream_index = 0;
 +        }
 +        if (stream_index == start_index)
 +            return;
 +        st = is->ic->streams[p ? p->stream_index[stream_index] : 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:
 +    if (p && stream_index != -1)
 +        stream_index = p->stream_index[stream_index];
 +    av_log(NULL, AV_LOG_INFO, "Switch %s stream from #%d to #%d\n",
 +           av_get_media_type_string(codec_type),
 +           old_index,
 +           stream_index);
 +
 +    stream_component_close(is, old_index);
 +    stream_component_open(is, stream_index);
 +}
 +
 +
 +static void toggle_full_screen(VideoState *is)
 +{
 +#if defined(__APPLE__) && SDL_VERSION_ATLEAST(1, 2, 14)
 +    /* OS X needs to reallocate the SDL overlays */
 +    int i;
 +    for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++)
 +        is->pictq.queue[i].reallocate = 1;
 +#endif
 +    is_full_screen = !is_full_screen;
 +    video_open(is, 1, NULL);
 +}
 +
 +static void toggle_audio_display(VideoState *is)
 +{
 +    int bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
 +    int next = is->show_mode;
 +    do {
 +        next = (next + 1) % SHOW_MODE_NB;
 +    } while (next != is->show_mode && (next == SHOW_MODE_VIDEO && !is->video_st || next != SHOW_MODE_VIDEO && !is->audio_st));
 +    if (is->show_mode != next) {
 +        fill_rectangle(screen,
 +                    is->xleft, is->ytop, is->width, is->height,
 +                    bgcolor, 1);
 +        is->force_refresh = 1;
 +        is->show_mode = next;
 +    }
 +}
 +
 +static void refresh_loop_wait_event(VideoState *is, SDL_Event *event) {
 +    double remaining_time = 0.0;
 +    SDL_PumpEvents();
 +    while (!SDL_PeepEvents(event, 1, SDL_GETEVENT, SDL_ALLEVENTS)) {
 +        if (!cursor_hidden && av_gettime_relative() - cursor_last_shown > CURSOR_HIDE_DELAY) {
 +            SDL_ShowCursor(0);
 +            cursor_hidden = 1;
 +        }
 +        if (remaining_time > 0.0)
 +            av_usleep((int64_t)(remaining_time * 1000000.0));
 +        remaining_time = REFRESH_RATE;
 +        if (is->show_mode != SHOW_MODE_NONE && (!is->paused || is->force_refresh))
 +            video_refresh(is, &remaining_time);
 +        SDL_PumpEvents();
 +    }
 +}
 +
 +static void seek_chapter(VideoState *is, int incr)
 +{
 +    int64_t pos = get_master_clock(is) * AV_TIME_BASE;
 +    int i;
 +
 +    if (!is->ic->nb_chapters)
 +        return;
 +
 +    /* find the current chapter */
 +    for (i = 0; i < is->ic->nb_chapters; i++) {
 +        AVChapter *ch = is->ic->chapters[i];
 +        if (av_compare_ts(pos, AV_TIME_BASE_Q, ch->start, ch->time_base) < 0) {
 +            i--;
 +            break;
 +        }
 +    }
 +
 +    i += incr;
 +    i = FFMAX(i, 0);
 +    if (i >= is->ic->nb_chapters)
 +        return;
 +
 +    av_log(NULL, AV_LOG_VERBOSE, "Seeking to chapter %d.\n", i);
 +    stream_seek(is, av_rescale_q(is->ic->chapters[i]->start, is->ic->chapters[i]->time_base,
 +                                 AV_TIME_BASE_Q), 0, 0);
 +}
 +
 +/* handle an event sent by the GUI */
 +static void event_loop(VideoState *cur_stream)
 +{
 +    SDL_Event event;
 +    double incr, pos, frac;
 +
 +    for (;;) {
 +        double x;
 +        refresh_loop_wait_event(cur_stream, &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_c:
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_VIDEO);
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_AUDIO);
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_SUBTITLE);
 +                break;
 +            case SDLK_t:
 +                stream_cycle_channel(cur_stream, AVMEDIA_TYPE_SUBTITLE);
 +                break;
 +            case SDLK_w:
 +#if CONFIG_AVFILTER
 +                if (cur_stream->show_mode == SHOW_MODE_VIDEO && cur_stream->vfilter_idx < nb_vfilters - 1) {
 +                    if (++cur_stream->vfilter_idx >= nb_vfilters)
 +                        cur_stream->vfilter_idx = 0;
 +                } else {
 +                    cur_stream->vfilter_idx = 0;
 +                    toggle_audio_display(cur_stream);
 +                }
 +#else
 +                toggle_audio_display(cur_stream);
 +#endif
 +                break;
 +            case SDLK_PAGEUP:
 +                if (cur_stream->ic->nb_chapters <= 1) {
 +                    incr = 600.0;
 +                    goto do_seek;
 +                }
 +                seek_chapter(cur_stream, 1);
 +                break;
 +            case SDLK_PAGEDOWN:
 +                if (cur_stream->ic->nb_chapters <= 1) {
 +                    incr = -600.0;
 +                    goto do_seek;
 +                }
 +                seek_chapter(cur_stream, -1);
 +                break;
 +            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) {
 +                        pos = -1;
 +                        if (pos < 0 && cur_stream->video_stream >= 0)
 +                            pos = frame_queue_last_pos(&cur_stream->pictq);
 +                        if (pos < 0 && cur_stream->audio_stream >= 0)
 +                            pos = frame_queue_last_pos(&cur_stream->sampq);
 +                        if (pos < 0)
 +                            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);
 +                        if (isnan(pos))
 +                            pos = (double)cur_stream->seek_pos / AV_TIME_BASE;
 +                        pos += incr;
 +                        if (cur_stream->ic->start_time != AV_NOPTS_VALUE && pos < cur_stream->ic->start_time / (double)AV_TIME_BASE)
 +                            pos = cur_stream->ic->start_time / (double)AV_TIME_BASE;
 +                        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 (cursor_hidden) {
 +                SDL_ShowCursor(1);
 +                cursor_hidden = 0;
 +            }
 +            cursor_last_shown = av_gettime_relative();
 +            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);
 +                    av_log(NULL, AV_LOG_INFO,
 +                           "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(FFMIN(16383, event.resize.w), event.resize.h, 0,
 +                                          SDL_HWSURFACE|(is_full_screen?SDL_FULLSCREEN:SDL_RESIZABLE)|SDL_ASYNCBLIT|SDL_HWACCEL);
 +                if (!screen) {
 +                    av_log(NULL, AV_LOG_FATAL, "Failed to set video mode\n");
 +                    do_exit(cur_stream);
 +                }
 +                screen_width  = cur_stream->width  = screen->w;
 +                screen_height = cur_stream->height = screen->h;
 +                cur_stream->force_refresh = 1;
 +            break;
 +        case SDL_QUIT:
 +        case FF_QUIT_EVENT:
 +            do_exit(cur_stream);
 +            break;
 +        case FF_ALLOC_EVENT:
 +            alloc_picture(event.user.data1);
 +            break;
 +        default:
 +            break;
 +        }
 +    }
 +}
 +
 +static int opt_frame_size(void *optctx, const char *opt, const char *arg)
 +{
 +    av_log(NULL, AV_LOG_WARNING, "Option -s is deprecated, use -video_size.\n");
 +    return opt_default(NULL, "video_size", arg);
 +}
 +
 +static int opt_width(void *optctx, 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(void *optctx, 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(void *optctx, const char *opt, const char *arg)
 +{
 +    file_iformat = av_find_input_format(arg);
 +    if (!file_iformat) {
 +        av_log(NULL, AV_LOG_FATAL, "Unknown input format: %s\n", arg);
 +        return AVERROR(EINVAL);
 +    }
 +    return 0;
 +}
 +
 +static int opt_frame_pix_fmt(void *optctx, const char *opt, const char *arg)
 +{
 +    av_log(NULL, AV_LOG_WARNING, "Option -pix_fmt is deprecated, use -pixel_format.\n");
 +    return opt_default(NULL, "pixel_format", arg);
 +}
 +
 +static int opt_sync(void *optctx, 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 {
 +        av_log(NULL, AV_LOG_ERROR, "Unknown value for %s: %s\n", opt, arg);
 +        exit(1);
 +    }
 +    return 0;
 +}
 +
 +static int opt_seek(void *optctx, const char *opt, const char *arg)
 +{
 +    start_time = parse_time_or_die(opt, arg, 1);
 +    return 0;
 +}
 +
 +static int opt_duration(void *optctx, const char *opt, const char *arg)
 +{
 +    duration = parse_time_or_die(opt, arg, 1);
 +    return 0;
 +}
 +
 +static int opt_show_mode(void *optctx, 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) {
 +        av_log(NULL, AV_LOG_FATAL,
 +               "Argument '%s' provided as input filename, but '%s' was already specified.\n",
 +                filename, input_filename);
 +        exit(1);
 +    }
 +    if (!strcmp(filename, "-"))
 +        filename = "pipe:";
 +    input_filename = filename;
 +}
 +
 +static int opt_codec(void *optctx, const char *opt, const char *arg)
 +{
 +   const char *spec = strchr(opt, ':');
 +   if (!spec) {
 +       av_log(NULL, AV_LOG_ERROR,
 +              "No media specifier was specified in '%s' in option '%s'\n",
 +               arg, opt);
 +       return AVERROR(EINVAL);
 +   }
 +   spec++;
 +   switch (spec[0]) {
 +   case 'a' :    audio_codec_name = arg; break;
 +   case 's' : subtitle_codec_name = arg; break;
 +   case 'v' :    video_codec_name = arg; break;
 +   default:
 +       av_log(NULL, AV_LOG_ERROR,
 +              "Invalid media specifier '%s' in option '%s'\n", spec, opt);
 +       return AVERROR(EINVAL);
 +   }
 +   return 0;
 +}
 +
 +static int dummy;
 +
 +static const OptionDef options[] = {
 +#include "cmdutils_common_opts.h"
 +    { "x", HAS_ARG, { .func_arg = opt_width }, "force displayed width", "width" },
 +    { "y", HAS_ARG, { .func_arg = opt_height }, "force displayed height", "height" },
 +    { "s", HAS_ARG | OPT_VIDEO, { .func_arg = opt_frame_size }, "set frame size (WxH or abbreviation)", "size" },
 +    { "fs", OPT_BOOL, { &is_full_screen }, "force full screen" },
 +    { "an", OPT_BOOL, { &audio_disable }, "disable audio" },
 +    { "vn", OPT_BOOL, { &video_disable }, "disable video" },
 +    { "sn", OPT_BOOL, { &subtitle_disable }, "disable subtitling" },
 +    { "ast", OPT_STRING | HAS_ARG | OPT_EXPERT, { &wanted_stream_spec[AVMEDIA_TYPE_AUDIO] }, "select desired audio stream", "stream_specifier" },
 +    { "vst", OPT_STRING | HAS_ARG | OPT_EXPERT, { &wanted_stream_spec[AVMEDIA_TYPE_VIDEO] }, "select desired video stream", "stream_specifier" },
 +    { "sst", OPT_STRING | HAS_ARG | OPT_EXPERT, { &wanted_stream_spec[AVMEDIA_TYPE_SUBTITLE] }, "select desired subtitle stream", "stream_specifier" },
 +    { "ss", HAS_ARG, { .func_arg = opt_seek }, "seek to a given position in seconds", "pos" },
 +    { "t", HAS_ARG, { .func_arg = opt_duration }, "play  \"duration\" seconds of audio/video", "duration" },
 +    { "bytes", OPT_INT | HAS_ARG, { &seek_by_bytes }, "seek by bytes 0=off 1=on -1=auto", "val" },
 +    { "nodisp", OPT_BOOL, { &display_disable }, "disable graphical display" },
 +    { "f", HAS_ARG, { .func_arg = opt_format }, "force format", "fmt" },
 +    { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, { .func_arg = opt_frame_pix_fmt }, "set pixel format", "format" },
 +    { "stats", OPT_BOOL | OPT_EXPERT, { &show_status }, "show status", "" },
 +    { "fast", OPT_BOOL | OPT_EXPERT, { &fast }, "non spec compliant optimizations", "" },
 +    { "genpts", OPT_BOOL | OPT_EXPERT, { &genpts }, "generate pts", "" },
 +    { "drp", OPT_INT | HAS_ARG | OPT_EXPERT, { &decoder_reorder_pts }, "let decoder reorder pts 0=off 1=on -1=auto", ""},
 +    { "lowres", OPT_INT | HAS_ARG | OPT_EXPERT, { &lowres }, "", "" },
 +    { "sync", HAS_ARG | OPT_EXPERT, { .func_arg = opt_sync }, "set audio-video sync. type (type=audio/video/ext)", "type" },
 +    { "autoexit", OPT_BOOL | OPT_EXPERT, { &autoexit }, "exit at the end", "" },
 +    { "exitonkeydown", OPT_BOOL | OPT_EXPERT, { &exit_on_keydown }, "exit on key down", "" },
 +    { "exitonmousedown", OPT_BOOL | OPT_EXPERT, { &exit_on_mousedown }, "exit on mouse down", "" },
 +    { "loop", OPT_INT | HAS_ARG | OPT_EXPERT, { &loop }, "set number of times the playback shall be looped", "loop count" },
 +    { "framedrop", OPT_BOOL | OPT_EXPERT, { &framedrop }, "drop frames when cpu is too slow", "" },
 +    { "infbuf", OPT_BOOL | OPT_EXPERT, { &infinite_buffer }, "don't limit the input buffer size (useful with realtime streams)", "" },
 +    { "window_title", OPT_STRING | HAS_ARG, { &window_title }, "set window title", "window title" },
 +#if CONFIG_AVFILTER
 +    { "vf", OPT_EXPERT | HAS_ARG, { .func_arg = opt_add_vfilter }, "set video filters", "filter_graph" },
 +    { "af", OPT_STRING | HAS_ARG, { &afilters }, "set audio filters", "filter_graph" },
 +#endif
 +    { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, { &rdftspeed }, "rdft speed", "msecs" },
 +    { "showmode", HAS_ARG, { .func_arg = opt_show_mode}, "select show mode (0 = video, 1 = waves, 2 = RDFT)", "mode" },
 +    { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, { .func_arg = opt_default }, "generic catch all option", "" },
 +    { "i", OPT_BOOL, { &dummy}, "read specified file", "input_file"},
 +    { "codec", HAS_ARG, { .func_arg = opt_codec}, "force decoder", "decoder_name" },
 +    { "acodec", HAS_ARG | OPT_STRING | OPT_EXPERT, {    &audio_codec_name }, "force audio decoder",    "decoder_name" },
 +    { "scodec", HAS_ARG | OPT_STRING | OPT_EXPERT, { &subtitle_codec_name }, "force subtitle decoder", "decoder_name" },
 +    { "vcodec", HAS_ARG | OPT_STRING | OPT_EXPERT, {    &video_codec_name }, "force video decoder",    "decoder_name" },
 +    { "autorotate", OPT_BOOL, { &autorotate }, "automatically rotate video", "" },
 +    { 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");
 +}
 +
 +void show_help_default(const char *opt, const char *arg)
 +{
 +    av_log_set_callback(log_callback_help);
 +    show_usage();
 +    show_help_options(options, "Main options:", 0, OPT_EXPERT, 0);
 +    show_help_options(options, "Advanced options:", OPT_EXPERT, 0, 0);
 +    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);
 +#else
 +    show_help_children(avfilter_get_class(), AV_OPT_FLAG_FILTERING_PARAM);
 +#endif
 +    printf("\nWhile playing:\n"
 +           "q, ESC              quit\n"
 +           "f                   toggle full screen\n"
 +           "p, SPC              pause\n"
 +           "a                   cycle audio channel in the current program\n"
 +           "v                   cycle video channel\n"
 +           "t                   cycle subtitle channel in the current program\n"
 +           "c                   cycle program\n"
 +           "w                   cycle video filters or show modes\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"
 +           );
 +}
 +
 +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;
 +    char dummy_videodriver[] = "SDL_VIDEODRIVER=dummy";
 +
 +    av_log_set_flags(AV_LOG_SKIP_REPEATED);
 +    parse_loglevel(argc, argv, options);
 +
 +    /* register all codecs, demux and protocols */
 +#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();
 +        av_log(NULL, AV_LOG_FATAL, "An input file must be specified\n");
 +        av_log(NULL, AV_LOG_FATAL,
 +               "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 (display_disable)
 +        SDL_putenv(dummy_videodriver); /* For the event queue, we always need a video driver. */
 +#if !defined(_WIN32) && !defined(__APPLE__)
 +    flags |= SDL_INIT_EVENTTHREAD; /* Not supported on Windows or Mac OS X */
 +#endif
 +    if (SDL_Init (flags)) {
 +        av_log(NULL, AV_LOG_FATAL, "Could not initialize SDL - %s\n", SDL_GetError());
 +        av_log(NULL, AV_LOG_FATAL, "(Did you set the DISPLAY variable?)\n");
 +        exit(1);
 +    }
 +
 +    if (!display_disable) {
 +        const SDL_VideoInfo *vi = SDL_GetVideoInfo();
 +        fs_screen_width = vi->current_w;
 +        fs_screen_height = vi->current_h;
 +    }
 +
 +    SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);
 +    SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE);
 +    SDL_EventState(SDL_USEREVENT, SDL_IGNORE);
 +
 +    if (av_lockmgr_register(lockmgr)) {
 +        av_log(NULL, AV_LOG_FATAL, "Could not initialize lock manager!\n");
 +        do_exit(NULL);
 +    }
 +
 +    av_init_packet(&flush_pkt);
 +    flush_pkt.data = (uint8_t *)&flush_pkt;
 +
 +    is = stream_open(input_filename, file_iformat);
 +    if (!is) {
 +        av_log(NULL, AV_LOG_FATAL, "Failed to initialize VideoState!\n");
 +        do_exit(NULL);
 +    }
 +
 +    event_loop(is);
 +
 +    /* never returns */
 +
 +    return 0;
 +}
Simple merge
index f56408c,0000000..c1e946a
mode 100644,000000..100644
--- /dev/null
@@@ -1,245 -1,0 +1,245 @@@
-         av_dlog(avctx,
 +/*
 + * Copyright (c) 2011 Stefano Sabatini
 + * Copyright (c) 2009 Giliard B. de Freitas <giliarde@gmail.com>
 + * Copyright (C) 2002 Gunnar Monell <gmo@linux.nu>
 + *
 + * 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
 + * Linux framebuffer input device,
 + * inspired by code from fbgrab.c by Gunnar Monell.
 + * @see http://linux-fbdev.sourceforge.net/
 + */
 +
 +#include <unistd.h>
 +#include <fcntl.h>
 +#include <sys/ioctl.h>
 +#include <sys/mman.h>
 +#include <time.h>
 +#include <linux/fb.h>
 +
 +#include "libavutil/internal.h"
 +#include "libavutil/log.h"
 +#include "libavutil/mem.h"
 +#include "libavutil/opt.h"
 +#include "libavutil/time.h"
 +#include "libavutil/parseutils.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavformat/internal.h"
 +#include "avdevice.h"
 +#include "fbdev_common.h"
 +
 +typedef struct FBDevContext {
 +    AVClass *class;          ///< class for private options
 +    int frame_size;          ///< size in bytes of a grabbed frame
 +    AVRational framerate_q;  ///< framerate
 +    int64_t time_frame;      ///< time for the next frame to output (in 1/1000000 units)
 +
 +    int fd;                  ///< framebuffer device file descriptor
 +    int width, height;       ///< assumed frame resolution
 +    int frame_linesize;      ///< linesize of the output frame, it is assumed to be constant
 +    int bytes_per_pixel;
 +
 +    struct fb_var_screeninfo varinfo; ///< variable info;
 +    struct fb_fix_screeninfo fixinfo; ///< fixed    info;
 +
 +    uint8_t *data;           ///< framebuffer data
 +} FBDevContext;
 +
 +static av_cold int fbdev_read_header(AVFormatContext *avctx)
 +{
 +    FBDevContext *fbdev = avctx->priv_data;
 +    AVStream *st = NULL;
 +    enum AVPixelFormat pix_fmt;
 +    int ret, flags = O_RDONLY;
 +    const char* device;
 +
 +    if (!(st = avformat_new_stream(avctx, NULL)))
 +        return AVERROR(ENOMEM);
 +    avpriv_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in microseconds */
 +
 +    /* NONBLOCK is ignored by the fbdev driver, only set for consistency */
 +    if (avctx->flags & AVFMT_FLAG_NONBLOCK)
 +        flags |= O_NONBLOCK;
 +
 +    if (avctx->filename[0])
 +        device = avctx->filename;
 +    else
 +        device = ff_fbdev_default_device();
 +
 +    if ((fbdev->fd = avpriv_open(device, flags)) == -1) {
 +        ret = AVERROR(errno);
 +        av_log(avctx, AV_LOG_ERROR,
 +               "Could not open framebuffer device '%s': %s\n",
 +               device, av_err2str(ret));
 +        return ret;
 +    }
 +
 +    if (ioctl(fbdev->fd, FBIOGET_VSCREENINFO, &fbdev->varinfo) < 0) {
 +        ret = AVERROR(errno);
 +        av_log(avctx, AV_LOG_ERROR,
 +               "FBIOGET_VSCREENINFO: %s\n", av_err2str(ret));
 +        goto fail;
 +    }
 +
 +    if (ioctl(fbdev->fd, FBIOGET_FSCREENINFO, &fbdev->fixinfo) < 0) {
 +        ret = AVERROR(errno);
 +        av_log(avctx, AV_LOG_ERROR,
 +               "FBIOGET_FSCREENINFO: %s\n", av_err2str(ret));
 +        goto fail;
 +    }
 +
 +    pix_fmt = ff_get_pixfmt_from_fb_varinfo(&fbdev->varinfo);
 +    if (pix_fmt == AV_PIX_FMT_NONE) {
 +        ret = AVERROR(EINVAL);
 +        av_log(avctx, AV_LOG_ERROR,
 +               "Framebuffer pixel format not supported.\n");
 +        goto fail;
 +    }
 +
 +    fbdev->width           = fbdev->varinfo.xres;
 +    fbdev->height          = fbdev->varinfo.yres;
 +    fbdev->bytes_per_pixel = (fbdev->varinfo.bits_per_pixel + 7) >> 3;
 +    fbdev->frame_linesize  = fbdev->width * fbdev->bytes_per_pixel;
 +    fbdev->frame_size      = fbdev->frame_linesize * fbdev->height;
 +    fbdev->time_frame      = AV_NOPTS_VALUE;
 +    fbdev->data = mmap(NULL, fbdev->fixinfo.smem_len, PROT_READ, MAP_SHARED, fbdev->fd, 0);
 +    if (fbdev->data == MAP_FAILED) {
 +        ret = AVERROR(errno);
 +        av_log(avctx, AV_LOG_ERROR, "Error in mmap(): %s\n", av_err2str(ret));
 +        goto fail;
 +    }
 +
 +    st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
 +    st->codec->codec_id   = AV_CODEC_ID_RAWVIDEO;
 +    st->codec->width      = fbdev->width;
 +    st->codec->height     = fbdev->height;
 +    st->codec->pix_fmt    = pix_fmt;
 +    st->codec->time_base  = av_inv_q(fbdev->framerate_q);
 +    st->codec->bit_rate   =
 +        fbdev->width * fbdev->height * fbdev->bytes_per_pixel * av_q2d(fbdev->framerate_q) * 8;
 +
 +    av_log(avctx, AV_LOG_INFO,
 +           "w:%d h:%d bpp:%d pixfmt:%s fps:%d/%d bit_rate:%d\n",
 +           fbdev->width, fbdev->height, fbdev->varinfo.bits_per_pixel,
 +           av_get_pix_fmt_name(pix_fmt),
 +           fbdev->framerate_q.num, fbdev->framerate_q.den,
 +           st->codec->bit_rate);
 +    return 0;
 +
 +fail:
 +    close(fbdev->fd);
 +    return ret;
 +}
 +
 +static int fbdev_read_packet(AVFormatContext *avctx, AVPacket *pkt)
 +{
 +    FBDevContext *fbdev = avctx->priv_data;
 +    int64_t curtime, delay;
 +    struct timespec ts;
 +    int i, ret;
 +    uint8_t *pin, *pout;
 +
 +    if (fbdev->time_frame == AV_NOPTS_VALUE)
 +        fbdev->time_frame = av_gettime();
 +
 +    /* wait based on the frame rate */
 +    while (1) {
 +        curtime = av_gettime();
 +        delay = fbdev->time_frame - curtime;
++        av_log(avctx, AV_LOG_TRACE,
 +                "time_frame:%"PRId64" curtime:%"PRId64" delay:%"PRId64"\n",
 +                fbdev->time_frame, curtime, delay);
 +        if (delay <= 0) {
 +            fbdev->time_frame += INT64_C(1000000) / av_q2d(fbdev->framerate_q);
 +            break;
 +        }
 +        if (avctx->flags & AVFMT_FLAG_NONBLOCK)
 +            return AVERROR(EAGAIN);
 +        ts.tv_sec  =  delay / 1000000;
 +        ts.tv_nsec = (delay % 1000000) * 1000;
 +        while (nanosleep(&ts, &ts) < 0 && errno == EINTR);
 +    }
 +
 +    if ((ret = av_new_packet(pkt, fbdev->frame_size)) < 0)
 +        return ret;
 +
 +    /* refresh fbdev->varinfo, visible data position may change at each call */
 +    if (ioctl(fbdev->fd, FBIOGET_VSCREENINFO, &fbdev->varinfo) < 0) {
 +        av_log(avctx, AV_LOG_WARNING,
 +               "Error refreshing variable info: %s\n", av_err2str(AVERROR(errno)));
 +    }
 +
 +    pkt->pts = curtime;
 +
 +    /* compute visible data offset */
 +    pin = fbdev->data + fbdev->bytes_per_pixel * fbdev->varinfo.xoffset +
 +                        fbdev->varinfo.yoffset * fbdev->fixinfo.line_length;
 +    pout = pkt->data;
 +
 +    for (i = 0; i < fbdev->height; i++) {
 +        memcpy(pout, pin, fbdev->frame_linesize);
 +        pin  += fbdev->fixinfo.line_length;
 +        pout += fbdev->frame_linesize;
 +    }
 +
 +    return fbdev->frame_size;
 +}
 +
 +static av_cold int fbdev_read_close(AVFormatContext *avctx)
 +{
 +    FBDevContext *fbdev = avctx->priv_data;
 +
 +    munmap(fbdev->data, fbdev->fixinfo.smem_len);
 +    close(fbdev->fd);
 +
 +    return 0;
 +}
 +
 +static int fbdev_get_device_list(AVFormatContext *s, AVDeviceInfoList *device_list)
 +{
 +    return ff_fbdev_get_device_list(device_list);
 +}
 +
 +#define OFFSET(x) offsetof(FBDevContext, x)
 +#define DEC AV_OPT_FLAG_DECODING_PARAM
 +static const AVOption options[] = {
 +    { "framerate","", OFFSET(framerate_q), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0, DEC },
 +    { NULL },
 +};
 +
 +static const AVClass fbdev_class = {
 +    .class_name = "fbdev indev",
 +    .item_name  = av_default_item_name,
 +    .option     = options,
 +    .version    = LIBAVUTIL_VERSION_INT,
 +    .category   = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT,
 +};
 +
 +AVInputFormat ff_fbdev_demuxer = {
 +    .name           = "fbdev",
 +    .long_name      = NULL_IF_CONFIG_SMALL("Linux framebuffer"),
 +    .priv_data_size = sizeof(FBDevContext),
 +    .read_header    = fbdev_read_header,
 +    .read_packet    = fbdev_read_packet,
 +    .read_close     = fbdev_read_close,
 +    .get_device_list = fbdev_get_device_list,
 +    .flags          = AVFMT_NOFILE,
 +    .priv_class     = &fbdev_class,
 +};
@@@ -177,24 -143,12 +177,24 @@@ static int filter_frame(AVFilterLink *i
      d = av_expr_eval(setpts->expr, setpts->var_values, NULL);
      frame->pts = D2TS(d);
  
-     av_dlog(inlink->dst,
+     av_log(inlink->dst, AV_LOG_TRACE,
 -            "n:%"PRId64" interlaced:%d pts:%"PRId64" t:%f -> pts:%"PRId64" t:%f\n",
 +            "N:%"PRId64" PTS:%s T:%f POS:%s",
              (int64_t)setpts->var_values[VAR_N],
 -            (int)setpts->var_values[VAR_INTERLACED],
 -            in_pts, in_pts * av_q2d(inlink->time_base),
 -            frame->pts, frame->pts * av_q2d(inlink->time_base));
 +            d2istr(setpts->var_values[VAR_PTS]),
 +            setpts->var_values[VAR_T],
 +            d2istr(setpts->var_values[VAR_POS]));
 +    switch (inlink->type) {
 +    case AVMEDIA_TYPE_VIDEO:
-         av_dlog(inlink->dst, " INTERLACED:%"PRId64,
++        av_log(inlink->dst, AV_LOG_TRACE, " INTERLACED:%"PRId64,
 +                (int64_t)setpts->var_values[VAR_INTERLACED]);
 +        break;
 +    case AVMEDIA_TYPE_AUDIO:
-         av_dlog(inlink->dst, " NB_SAMPLES:%"PRId64" NB_CONSUMED_SAMPLES:%"PRId64,
++        av_log(inlink->dst, AV_LOG_TRACE, " NB_SAMPLES:%"PRId64" NB_CONSUMED_SAMPLES:%"PRId64,
 +                (int64_t)setpts->var_values[VAR_NB_SAMPLES],
 +                (int64_t)setpts->var_values[VAR_NB_CONSUMED_SAMPLES]);
 +        break;
 +    }
-     av_dlog(inlink->dst, " -> PTS:%s T:%f\n", d2istr(d), TS2T(d, inlink->time_base));
++    av_log(inlink->dst, AV_LOG_TRACE, " -> PTS:%s T:%f\n", d2istr(d), TS2T(d, inlink->time_base));
  
      if (inlink->type == AVMEDIA_TYPE_VIDEO) {
          setpts->var_values[VAR_N] += 1.0;
@@@ -271,9 -265,9 +271,9 @@@ static int filter_frame(AVFilterLink *l
      s->x &= ~((1 << s->hsub) - 1);
      s->y &= ~((1 << s->vsub) - 1);
  
-     av_dlog(ctx, "n:%d t:%f pos:%f x:%d y:%d x+w:%d y+h:%d\n",
 -    av_log(ctx, AV_LOG_TRACE, "n:%d t:%f x:%d y:%d x+w:%d y+h:%d\n",
 -            (int)s->var_values[VAR_N], s->var_values[VAR_T], s->x,
 -            s->y, s->x+s->w, s->y+s->h);
++    av_log(ctx, AV_LOG_TRACE, "n:%d t:%f pos:%f x:%d y:%d x+w:%d y+h:%d\n",
 +            (int)s->var_values[VAR_N], s->var_values[VAR_T], s->var_values[VAR_POS],
 +            s->x, s->y, s->x+s->w, s->y+s->h);
  
      frame->data[0] += s->y * frame->linesize[0];
      frame->data[0] += s->x * s->max_step[0];
@@@ -93,18 -102,7 +93,18 @@@ static int filter_frame(AVFilterLink *i
          return ff_filter_frame(outlink, frame);
      }
  
-     av_dlog(ctx,
 +    if (av_frame_is_writable(frame)) {
 +        out = frame;
 +    } else {
 +        out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
 +        if (!out) {
 +            av_frame_free(&frame);
 +            return AVERROR(ENOMEM);
 +        }
 +        av_frame_copy_props(out, frame);
 +    }
 +
+     av_log(ctx, AV_LOG_TRACE,
              "picture will move %s one line\n",
              s->dst_tff ? "up" : "down");
      h = frame->height;
@@@ -1019,66 -985,29 +1019,66 @@@ static int asf_read_frame_header(AVForm
      DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0);
      DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0);
      DO_2BITS(asf->packet_property, asf->packet_replic_size, 0);
-     av_dlog(asf, "key:%d stream:%d seq:%d offset:%d replic_size:%d\n",
+     av_log(asf, AV_LOG_TRACE, "key:%d stream:%d seq:%d offset:%d replic_size:%d\n",
              asf->packet_key_frame, asf->stream_index, asf->packet_seq,
              asf->packet_frag_offset, asf->packet_replic_size);
 +    if (rsize+(int64_t)asf->packet_replic_size > asf->packet_size_left) {
 +        av_log(s, AV_LOG_ERROR, "packet_replic_size %d is invalid\n", asf->packet_replic_size);
 +        return AVERROR_INVALIDDATA;
 +    }
      if (asf->packet_replic_size >= 8) {
 -        asf->packet_obj_size = avio_rl32(pb);
 -        if (asf->packet_obj_size >= (1 << 24) || asf->packet_obj_size <= 0) {
 +        int64_t end = avio_tell(pb) + asf->packet_replic_size;
 +        AVRational aspect;
 +        asfst->packet_obj_size = avio_rl32(pb);
 +        if (asfst->packet_obj_size >= (1 << 24) || asfst->packet_obj_size <= 0) {
              av_log(s, AV_LOG_ERROR, "packet_obj_size invalid\n");
 -            return -1;
 +            asfst->packet_obj_size = 0;
 +            return AVERROR_INVALIDDATA;
          }
          asf->packet_frag_timestamp = avio_rl32(pb); // timestamp
 -        if (asf->packet_replic_size >= 8 + 38 + 4) {
 -            avio_skip(pb, 10);
 -            ts0 = avio_rl64(pb);
 -            avio_skip(pb, 8);
 -            avio_skip(pb, 12);
 -            avio_rl32(pb);
 -            avio_skip(pb, asf->packet_replic_size - 8 - 38 - 4);
 -            if (ts0 != -1)
 -                asf->packet_frag_timestamp = ts0 / 10000;
 -            else
 -                asf->packet_frag_timestamp = AV_NOPTS_VALUE;
 -        } else
 -            avio_skip(pb, asf->packet_replic_size - 8);
 +
 +        for (i = 0; i < asfst->payload_ext_ct; i++) {
 +            ASFPayload *p = &asfst->payload[i];
 +            int size = p->size;
 +            int64_t payend;
 +            if (size == 0xFFFF)
 +                size = avio_rl16(pb);
 +            payend = avio_tell(pb) + size;
 +            if (payend > end) {
 +                av_log(s, AV_LOG_ERROR, "too long payload\n");
 +                break;
 +            }
 +            switch (p->type) {
 +            case 0x50:
 +//              duration = avio_rl16(pb);
 +                break;
 +            case 0x54:
 +                aspect.num = avio_r8(pb);
 +                aspect.den = avio_r8(pb);
 +                if (aspect.num > 0 && aspect.den > 0 && asf->stream_index >= 0) {
 +                    s->streams[asf->stream_index]->sample_aspect_ratio = aspect;
 +                }
 +                break;
 +            case 0x2A:
 +                avio_skip(pb, 8);
 +                ts0 = avio_rl64(pb);
 +                ts1 = avio_rl64(pb);
 +                if (ts0!= -1) asf->packet_frag_timestamp = ts0/10000;
 +                else          asf->packet_frag_timestamp = AV_NOPTS_VALUE;
 +                asf->ts_is_pts = 1;
 +                break;
 +            case 0x5B:
 +            case 0xB7:
 +            case 0xCC:
 +            case 0xC0:
 +            case 0xA0:
 +                //unknown
 +                break;
 +            }
 +            avio_seek(pb, payend, SEEK_SET);
 +        }
 +
 +        avio_seek(pb, end, SEEK_SET);
          rsize += asf->packet_replic_size; // FIXME - check validity
      } else if (asf->packet_replic_size == 1) {
          // multipacket - frag_offset is beginning timestamp
@@@ -118,8 -95,8 +118,8 @@@ static int avi_load_index(AVFormatConte
  static int guess_ni_flag(AVFormatContext *s);
  
  #define print_tag(str, tag, size)                        \
-     av_dlog(NULL, "pos:%"PRIX64" %s: tag=%c%c%c%c size=0x%x\n", \
 -    av_log(NULL, AV_LOG_TRACE, "%s: tag=%c%c%c%c size=0x%x\n",        \
 -            str, tag & 0xff,                             \
++    av_log(NULL, AV_LOG_TRACE, "pos:%"PRIX64" %s: tag=%c%c%c%c size=0x%x\n", \
 +            avio_tell(pb), str, tag & 0xff,              \
              (tag >> 8) & 0xff,                           \
              (tag >> 16) & 0xff,                          \
              (tag >> 24) & 0xff,                          \
@@@ -178,9 -155,9 +178,9 @@@ static int read_braindead_odml_indx(AVF
      int64_t last_pos = -1;
      int64_t filesize = avi->fsize;
  
-     av_dlog(s,
+     av_log(s, AV_LOG_TRACE,
              "longs_pre_entry:%d index_type:%d entries_in_use:%d "
 -            "chunk_id:%X base:%16"PRIX64"\n",
 +            "chunk_id:%X base:%16"PRIX64" frame_num:%d\n",
              longs_pre_entry,
              index_type,
              entries_in_use,
              int key     = len >= 0;
              len &= 0x7FFFFFFF;
  
- #ifdef DEBUG_SEEK
-             av_log(s, AV_LOG_ERROR, "pos:%"PRId64", len:%X\n", pos, len);
- #endif
+             av_log(s, AV_LOG_TRACE, "pos:%"PRId64", len:%X\n", pos, len);
 -            if (pb->eof_reached)
 +            if (avio_feof(pb))
                  return AVERROR_INVALIDDATA;
  
              if (last_pos == pos || pos == base - 8)
@@@ -662,13 -547,9 +661,13 @@@ static int avi_read_header(AVFormatCont
              st->start_time = 0;
              avio_rl32(pb); /* buffer size */
              avio_rl32(pb); /* quality */
 +            if (ast->cum_len*ast->scale/ast->rate > 3600) {
 +                av_log(s, AV_LOG_ERROR, "crazy start time, iam scared, giving up\n");
 +                ast->cum_len = 0;
 +            }
              ast->sample_size = avio_rl32(pb); /* sample ssize */
              ast->cum_len    *= FFMAX(1, ast->sample_size);
-             av_dlog(s, "%"PRIu32" %"PRIu32" %d\n",
+             av_log(s, AV_LOG_TRACE, "%"PRIu32" %"PRIu32" %d\n",
                      ast->rate, ast->scale, ast->sample_size);
  
              switch (tag1) {
@@@ -1151,9 -957,9 +1150,9 @@@ start_sync
          size = d[4] + (d[5] << 8) + (d[6] << 16) + (d[7] << 24);
  
          n = get_stream_idx(d + 2);
-         av_dlog(s, "%X %X %X %X %X %X %X %X %"PRId64" %u %d\n",
+         av_log(s, AV_LOG_TRACE, "%X %X %X %X %X %X %X %X %"PRId64" %u %d\n",
                  d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n);
 -        if (i + (uint64_t)size > avi->fsize || d[0] > 127)
 +        if (i*(avi->io_fsize>0) + (uint64_t)size > avi->fsize || d[0] > 127)
              continue;
  
          // parse ix##
@@@ -1561,27 -1313,18 +1560,27 @@@ static int avi_read_idx1(AVFormatContex
          }
          pos += data_offset;
  
-         av_dlog(s, "%d cum_len=%"PRId64"\n", len, ast->cum_len);
+         av_log(s, AV_LOG_TRACE, "%d cum_len=%"PRId64"\n", len, ast->cum_len);
  
 -        if (pb->eof_reached)
 -            return AVERROR_INVALIDDATA;
 -
 +        // even if we have only a single stream, we should
 +        // switch to non-interleaved to get correct timestamps
          if (last_pos == pos)
              avi->non_interleaved = 1;
 -        else if (len || !ast->sample_size)
 +        if (last_idx != pos && len) {
              av_add_index_entry(st, pos, ast->cum_len, len, 0,
                                 (flags & AVIIF_INDEX) ? AVINDEX_KEYFRAME : 0);
 +            last_idx= pos;
 +        }
          ast->cum_len += get_duration(ast, len);
          last_pos      = pos;
 +        anykey       |= flags&AVIIF_INDEX;
 +    }
 +    if (!anykey) {
 +        for (index = 0; index < s->nb_streams; index++) {
 +            st = s->streams[index];
 +            if (st->nb_index_entries)
 +                st->index_entries[0].flags |= AVINDEX_KEYFRAME;
 +        }
      }
      return 0;
  }
@@@ -1690,15 -1433,13 +1689,15 @@@ static int avi_load_index(AVFormatConte
  
      if (avio_seek(pb, avi->movi_end, SEEK_SET) < 0)
          goto the_end; // maybe truncated file
-     av_dlog(s, "movi_end=0x%"PRIx64"\n", avi->movi_end);
+     av_log(s, AV_LOG_TRACE, "movi_end=0x%"PRIx64"\n", avi->movi_end);
      for (;;) {
 -        if (pb->eof_reached)
 -            break;
          tag  = avio_rl32(pb);
          size = avio_rl32(pb);
-         av_dlog(s, "tag=%c%c%c%c size=0x%x\n",
 +        if (avio_feof(pb))
 +            break;
 +        next = avio_tell(pb) + size + (size & 1);
 +
+         av_log(s, AV_LOG_TRACE, "tag=%c%c%c%c size=0x%x\n",
                   tag        & 0xff,
                  (tag >>  8) & 0xff,
                  (tag >> 16) & 0xff,
@@@ -798,8 -750,8 +798,8 @@@ static int flv_read_packet(AVFormatCont
          size = avio_rb24(s->pb);
          dts  = avio_rb24(s->pb);
          dts |= avio_r8(s->pb) << 24;
-         av_dlog(s, "type:%d, size:%d, dts:%"PRId64" pos:%"PRId64"\n", type, size, dts, avio_tell(s->pb));
 -        av_log(s, AV_LOG_TRACE, "type:%d, size:%d, dts:%"PRId64"\n", type, size, dts);
 -        if (s->pb->eof_reached)
++        av_log(s, AV_LOG_TRACE, "type:%d, size:%d, dts:%"PRId64" pos:%"PRId64"\n", type, size, dts, avio_tell(s->pb));
 +        if (avio_feof(s->pb))
              return AVERROR_EOF;
          avio_skip(s->pb, 3); /* stream id, always 0 */
          flags = 0;
@@@ -881,23 -818,22 +881,23 @@@ skip
              }
          }
          if (i == s->nb_streams) {
 -            st = create_stream(s, is_audio ? AVMEDIA_TYPE_AUDIO
 -                                           : AVMEDIA_TYPE_VIDEO);
 +            static const enum AVMediaType stream_types[] = {AVMEDIA_TYPE_VIDEO, AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_SUBTITLE};
 +            av_log(s, AV_LOG_WARNING, "Stream discovered after head already parsed\n");
 +            st = create_stream(s, stream_types[stream_type]);
              if (!st)
                  return AVERROR(ENOMEM);
 +
          }
-         av_dlog(s, "%d %X %d \n", stream_type, flags, st->discard);
 -        av_log(s, AV_LOG_TRACE, "%d %X %d \n", is_audio, flags, st->discard);
++        av_log(s, AV_LOG_TRACE, "%d %X %d \n", stream_type, flags, st->discard);
  
          if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY ||
 -            is_audio)
 +            stream_type == FLV_STREAM_TYPE_AUDIO)
              av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME);
  
 -        if ((st->discard >= AVDISCARD_NONKEY &&
 -             !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || is_audio)) ||
 -            (st->discard >= AVDISCARD_BIDIR &&
 -             ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && !is_audio)) ||
 -            st->discard >= AVDISCARD_ALL) {
 +        if (  (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || (stream_type == FLV_STREAM_TYPE_AUDIO)))
 +            ||(st->discard >= AVDISCARD_BIDIR  &&  ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && (stream_type == FLV_STREAM_TYPE_VIDEO)))
 +            || st->discard >= AVDISCARD_ALL
 +        ) {
              avio_seek(s->pb, next, SEEK_SET);
              continue;
          }
@@@ -1017,9 -933,8 +1017,9 @@@ retry_duration
                      st->codec->sample_rate = cfg.ext_sample_rate;
                  else
                      st->codec->sample_rate = cfg.sample_rate;
-                 av_dlog(s, "mp4a config channels %d sample rate %d\n",
+                 av_log(s, AV_LOG_TRACE, "mp4a config channels %d sample rate %d\n",
                          st->codec->channels, st->codec->sample_rate);
 +                }
              }
  
              ret = AVERROR(EAGAIN);
Simple merge
@@@ -559,7 -460,7 +559,7 @@@ static int process_line(URLContext *h, 
              p++;
          s->http_code = strtol(p, &end, 10);
  
-         av_log(h, AV_LOG_DEBUG, "http_code=%d\n", s->http_code);
 -        av_log(NULL, AV_LOG_TRACE, "http_code=%d\n", s->http_code);
++        av_log(h, AV_LOG_TRACE, "http_code=%d\n", s->http_code);
  
          if ((ret = check_http_code(h, s->http_code, end)) < 0)
              return ret;
@@@ -748,7 -535,7 +748,7 @@@ static int http_read_header(URLContext 
          if ((err = http_get_line(s, line, sizeof(line))) < 0)
              return err;
  
-         av_log(h, AV_LOG_DEBUG, "header='%s'\n", line);
 -        av_log(NULL, AV_LOG_TRACE, "header='%s'\n", line);
++        av_log(h, AV_LOG_TRACE, "header='%s'\n", line);
  
          err = process_line(h, line, s->line_count, new_location);
          if (err < 0)
@@@ -320,9 -320,9 +320,9 @@@ static int process_ipmovie_chunk(IPMVEC
              break;
  
          case OPCODE_CREATE_TIMER:
-             av_dlog(NULL, "create timer\n");
+             av_log(NULL, AV_LOG_TRACE, "create timer\n");
 -            if ((opcode_version > 0) || (opcode_size > 6)) {
 +            if ((opcode_version > 0) || (opcode_size != 6)) {
-                 av_dlog(NULL, "bad create_timer opcode\n");
+                 av_log(NULL, AV_LOG_TRACE, "bad create_timer opcode\n");
                  chunk_type = CHUNK_BAD;
                  break;
              }
              break;
  
          case OPCODE_INIT_AUDIO_BUFFERS:
-             av_dlog(NULL, "initialize audio buffers\n");
+             av_log(NULL, AV_LOG_TRACE, "initialize audio buffers\n");
 -            if ((opcode_version > 1) || (opcode_size > 10)) {
 +            if (opcode_version > 1 || opcode_size > 10 || opcode_size < 6) {
-                 av_dlog(NULL, "bad init_audio_buffers opcode\n");
+                 av_log(NULL, AV_LOG_TRACE, "bad init_audio_buffers opcode\n");
                  chunk_type = CHUNK_BAD;
                  break;
              }
              break;
  
          case OPCODE_INIT_VIDEO_BUFFERS:
-             av_dlog(NULL, "initialize video buffers\n");
+             av_log(NULL, AV_LOG_TRACE, "initialize video buffers\n");
 -            if ((opcode_version > 2) || (opcode_size > 8)) {
 +            if ((opcode_version > 2) || (opcode_size > 8) || opcode_size < 4
 +                || opcode_version == 2 && opcode_size < 8
 +            ) {
-                 av_dlog(NULL, "bad init_video_buffers opcode\n");
+                 av_log(NULL, AV_LOG_TRACE, "bad init_video_buffers opcode\n");
                  chunk_type = CHUNK_BAD;
                  break;
              }
              break;
  
          case OPCODE_SET_PALETTE:
-             av_dlog(NULL, "set palette\n");
+             av_log(NULL, AV_LOG_TRACE, "set palette\n");
              /* check for the logical maximum palette size
               * (3 * 256 + 4 bytes) */
 -            if (opcode_size > 0x304) {
 -                av_log(NULL, AV_LOG_TRACE, "demux_ipmovie: set_palette opcode too large\n");
 +            if (opcode_size > 0x304 || opcode_size < 4) {
-                 av_dlog(NULL, "demux_ipmovie: set_palette opcode with invalid size\n");
++                av_log(NULL, AV_LOG_TRACE, "demux_ipmovie: set_palette opcode with invalid size\n");
                  chunk_type = CHUNK_BAD;
                  break;
              }
              first_color = AV_RL16(&scratch[0]);
              last_color = first_color + AV_RL16(&scratch[2]) - 1;
              /* sanity check (since they are 16 bit values) */
 -            if ((first_color > 0xFF) || (last_color > 0xFF)) {
 +            if (   (first_color > 0xFF) || (last_color > 0xFF)
 +                || (last_color - first_color + 1)*3 + 4 > opcode_size) {
-                 av_dlog(NULL, "demux_ipmovie: set_palette indexes out of range (%d -> %d)\n",
+                 av_log(NULL, AV_LOG_TRACE, "demux_ipmovie: set_palette indexes out of range (%d -> %d)\n",
                      first_color, last_color);
                  chunk_type = CHUNK_BAD;
                  break;
@@@ -455,18 -442,11 +455,18 @@@ int ff_mp4_read_dec_config_descr(AVForm
      avio_rb32(pb); /* max bitrate */
      avio_rb32(pb); /* avg bitrate */
  
 -    st->codec->codec_id= ff_codec_get_id(ff_mp4_obj_type, object_type_id);
 +    if(avcodec_is_open(st->codec)) {
 +        av_log(fc, AV_LOG_DEBUG, "codec open in read_dec_config_descr\n");
 +        return -1;
 +    }
 +
 +    codec_id= ff_codec_get_id(ff_mp4_obj_type, object_type_id);
 +    if (codec_id)
 +        st->codec->codec_id= codec_id;
-     av_dlog(fc, "esds object type id 0x%02x\n", object_type_id);
+     av_log(fc, AV_LOG_TRACE, "esds object type id 0x%02x\n", object_type_id);
      len = ff_mp4_read_descr(fc, pb, &tag);
      if (tag == MP4DecSpecificDescrTag) {
-         av_dlog(fc, "Specific MPEG4 header len=%d\n", len);
+         av_log(fc, AV_LOG_TRACE, "Specific MPEG4 header len=%d\n", len);
          if (!len || (uint64_t)len > (1<<30))
              return -1;
          av_free(st->codec->extradata);
Simple merge
Simple merge
@@@ -822,23 -810,8 +822,23 @@@ static int mov_read_moov(MOVContext *c
  
  static int mov_read_moof(MOVContext *c, AVIOContext *pb, MOVAtom atom)
  {
 +    if (!c->has_looked_for_mfra && c->use_mfra_for > 0) {
 +        c->has_looked_for_mfra = 1;
 +        if (pb->seekable) {
 +            int ret;
 +            av_log(c->fc, AV_LOG_VERBOSE, "stream has moof boxes, will look "
 +                    "for a mfra\n");
 +            if ((ret = mov_read_mfra(c, pb)) < 0) {
 +                av_log(c->fc, AV_LOG_VERBOSE, "found a moof box but failed to "
 +                        "read the mfra (may be a live ismv)\n");
 +            }
 +        } else {
 +            av_log(c->fc, AV_LOG_VERBOSE, "found a moof box but stream is not "
 +                    "seekable, can not look for mfra\n");
 +        }
 +    }
      c->fragment.moof_offset = c->fragment.implicit_offset = avio_tell(pb) - 8;
-     av_dlog(c->fc, "moof offset %"PRIx64"\n", c->fragment.moof_offset);
+     av_log(c->fc, AV_LOG_TRACE, "moof offset %"PRIx64"\n", c->fragment.moof_offset);
      return mov_read_default(c, pb, atom);
  }
  
@@@ -919,13 -889,9 +919,13 @@@ static int mov_read_mvhd(MOVContext *c
      mov_metadata_creation_time(&c->fc->metadata, creation_time);
      c->time_scale = avio_rb32(pb); /* time scale */
  
-     av_dlog(c->fc, "time scale = %i\n", c->time_scale);
+     av_log(c->fc, AV_LOG_TRACE, "time scale = %i\n", c->time_scale);
  
      c->duration = (version == 1) ? avio_rb64(pb) : avio_rb32(pb); /* duration */
 +    // set the AVCodecContext duration because the duration of individual tracks
 +    // may be inaccurate
 +    if (c->time_scale > 0 && !c->trex_data)
 +        c->fc->duration = av_rescale(c->duration, AV_TIME_BASE, c->time_scale);
      avio_rb32(pb); /* preferred scale */
  
      avio_rb16(pb); /* preferred volume */
@@@ -953,8 -944,8 +953,8 @@@ static int mov_read_enda(MOVContext *c
          return 0;
      st = c->fc->streams[c->fc->nb_streams-1];
  
 -    little_endian = !!avio_rb16(pb);
 +    little_endian = avio_rb16(pb) & 0xFF;
-     av_dlog(c->fc, "enda %d\n", little_endian);
+     av_log(c->fc, AV_LOG_TRACE, "enda %d\n", little_endian);
      if (little_endian == 1) {
          switch (st->codec->codec_id) {
          case AV_CODEC_ID_PCM_S24BE:
@@@ -998,8 -989,9 +998,9 @@@ static int mov_read_colr(MOVContext *c
      color_trc = avio_rb16(pb);
      color_matrix = avio_rb16(pb);
  
-     av_dlog(c->fc, "%s: pri %d trc %d matrix %d",
-             color_parameter_type, color_primaries, color_trc, color_matrix);
+     av_log(c->fc, AV_LOG_TRACE,
 -           "%s: pri %"PRIu16" trc %"PRIu16" matrix %"PRIu16"",
++           "%s: pri %d trc %d matrix %d",
+            color_parameter_type, color_primaries, color_trc, color_matrix);
  
      if (!strncmp(color_parameter_type, "nclx", 4)) {
          uint8_t color_range = avio_r8(pb) >> 7;
@@@ -1588,10 -1430,8 +1589,10 @@@ static void mov_parse_stsd_audio(MOVCon
      st->codec->sample_rate = ((avio_rb32(pb) >> 16));
  
      // Read QT version 1 fields. In version 0 these do not exist.
-     av_dlog(c->fc, "version =%d, isom =%d\n", version, c->isom);
+     av_log(c->fc, AV_LOG_TRACE, "version =%d, isom =%d\n", version, c->isom);
 -    if (!c->isom) {
 +    if (!c->isom ||
 +        (compatible_brands && strstr(compatible_brands->value, "qt  "))) {
 +
          if (version == 1) {
              sc->samples_per_frame = avio_rb32(pb);
              avio_rb32(pb); /* bytes per packet */
@@@ -1918,7 -1708,7 +1919,7 @@@ int ff_mov_read_stsd_entries(MOVContex
  
          id = mov_codec_id(st, format);
  
-         av_dlog(c->fc, "size=%"PRId64" 4CC= %c%c%c%c codec_type=%d\n", size,
 -        av_log(c->fc, AV_LOG_TRACE, "size=%"PRIu32" 4CC= %"PRIu8"%"PRIu8"%"PRIu8"%"PRIu8" codec_type=%d\n", size,
++        av_log(c->fc, AV_LOG_TRACE, "size=%"PRId64" 4CC= %c%c%c%c codec_type=%d\n", size,
                  (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff,
                  (format >> 24) & 0xff, st->codec->codec_type);
  
@@@ -2188,14 -1964,16 +2189,14 @@@ static int mov_read_stts(MOVContext *c
      avio_rb24(pb); /* flags */
      entries = avio_rb32(pb);
  
-     av_dlog(c->fc, "track[%i].stts.entries = %i\n",
+     av_log(c->fc, AV_LOG_TRACE, "track[%i].stts.entries = %i\n",
              c->fc->nb_streams-1, entries);
  
 -    if (!entries)
 -        return 0;
 -    if (entries >= UINT_MAX / sizeof(*sc->stts_data))
 -        return AVERROR(EINVAL);
 -
 +    if (sc->stts_data)
 +        av_log(c->fc, AV_LOG_WARNING, "Duplicated STTS atom\n");
      av_free(sc->stts_data);
 -    sc->stts_data = av_malloc(entries * sizeof(*sc->stts_data));
 +    sc->stts_count = 0;
 +    sc->stts_data = av_malloc_array(entries, sizeof(*sc->stts_data));
      if (!sc->stts_data)
          return AVERROR(ENOMEM);
  
          sc->stts_data[i].count= sample_count;
          sc->stts_data[i].duration= sample_duration;
  
-         av_dlog(c->fc, "sample_count=%d, sample_duration=%d\n",
+         av_log(c->fc, AV_LOG_TRACE, "sample_count=%d, sample_duration=%d\n",
                  sample_count, sample_duration);
  
 +        if (   i+1 == entries
 +            && i
 +            && sample_count == 1
 +            && total_sample_count > 100
 +            && sample_duration/10 > duration / total_sample_count)
 +            sample_duration = duration / total_sample_count;
          duration+=(int64_t)sample_duration*sample_count;
          total_sample_count+=sample_count;
      }
@@@ -2285,19 -2040,8 +2286,19 @@@ static int mov_read_ctts(MOVContext *c
  
          sc->ctts_data[i].count   = count;
          sc->ctts_data[i].duration= duration;
 -        if (duration < 0)
 -            sc->dts_shift = FFMAX(sc->dts_shift, -duration);
 +
-         av_dlog(c->fc, "count=%d, duration=%d\n",
++        av_log(c->fc, AV_LOG_TRACE, "count=%d, duration=%d\n",
 +                count, duration);
 +
 +        if (FFABS(duration) > (1<<28) && i+2<entries) {
 +            av_log(c->fc, AV_LOG_WARNING, "CTTS invalid\n");
 +            av_freep(&sc->ctts_data);
 +            sc->ctts_count = 0;
 +            return 0;
 +        }
 +
 +        if (i+2<entries)
 +            mov_update_dts_shift(sc, duration);
      }
  
      sc->ctts_count = i;
@@@ -2484,11 -2186,9 +2485,11 @@@ static void mov_build_index(MOVContext 
                      e->size = sample_size;
                      e->min_distance = distance;
                      e->flags = keyframe ? AVINDEX_KEYFRAME : 0;
-                     av_dlog(mov->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", "
+                     av_log(mov->fc, AV_LOG_TRACE, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", "
                              "size %d, distance %d, keyframe %d\n", st->index, current_sample,
                              current_offset, current_dts, sample_size, distance, keyframe);
 +                    if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->nb_index_entries < 100)
 +                        ff_rfps_add_frame(mov->fc, st, current_dts);
                  }
  
                  current_offset += sample_size;
@@@ -3025,26 -2663,7 +3026,26 @@@ static int mov_read_tfhd(MOVContext *c
                       avio_rb32(pb) : trex->size;
      frag->flags    = flags & MOV_TFHD_DEFAULT_FLAGS ?
                       avio_rb32(pb) : trex->flags;
-     av_dlog(c->fc, "frag flags 0x%x\n", frag->flags);
 +    frag->time     = AV_NOPTS_VALUE;
 +    if (index) {
 +        int i, found = 0;
 +        for (i = index->current_item; i < index->item_count; i++) {
 +            if (frag->implicit_offset == index->items[i].moof_offset) {
 +                av_log(c->fc, AV_LOG_DEBUG, "found fragment index entry "
 +                        "for track %u and moof_offset %"PRId64"\n",
 +                        frag->track_id, index->items[i].moof_offset);
 +                frag->time = index->items[i].time;
 +                index->current_item = i + 1;
 +                found = 1;
 +            }
 +        }
 +        if (!found) {
 +            av_log(c->fc, AV_LOG_WARNING, "track %u has a fragment index "
 +                   "but it doesn't have an (in-order) entry for moof_offset "
 +                   "%"PRId64"\n", frag->track_id, frag->implicit_offset);
 +        }
 +    }
+     av_log(c->fc, AV_LOG_TRACE, "frag flags 0x%x\n", frag->flags);
      return 0;
  }
  
@@@ -3213,12 -2806,9 +3214,12 @@@ static int mov_read_trun(MOVContext *c
                                    MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES));
          if (keyframe)
              distance = 0;
 -        av_add_index_entry(st, offset, dts, sample_size, distance,
 -                           keyframe ? AVINDEX_KEYFRAME : 0);
 +        err = av_add_index_entry(st, offset, dts, sample_size, distance,
 +                                 keyframe ? AVINDEX_KEYFRAME : 0);
 +        if (err < 0) {
 +            av_log(c->fc, AV_LOG_ERROR, "Failed to add index entry\n");
 +        }
-         av_dlog(c->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", "
+         av_log(c->fc, AV_LOG_TRACE, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", "
                  "size %d, distance %d, keyframe %d\n", st->index, sc->sample_count+i,
                  offset, dts, sample_size, distance, keyframe);
          distance++;
@@@ -3322,132 -2910,30 +3323,132 @@@ static int mov_read_elst(MOVContext *c
      avio_rb24(pb); /* flags */
      edit_count = avio_rb32(pb); /* entries */
  
 -    if ((uint64_t)edit_count*12+8 > atom.size)
 -        return AVERROR_INVALIDDATA;
 +    if (!edit_count)
 +        return 0;
 +    if (sc->elst_data)
 +        av_log(c->fc, AV_LOG_WARNING, "Duplicated ELST atom\n");
 +    av_free(sc->elst_data);
 +    sc->elst_count = 0;
 +    sc->elst_data = av_malloc_array(edit_count, sizeof(*sc->elst_data));
 +    if (!sc->elst_data)
 +        return AVERROR(ENOMEM);
 +
-     av_dlog(c->fc, "track[%i].edit_count = %i\n", c->fc->nb_streams-1, edit_count);
++    av_log(c->fc, AV_LOG_TRACE, "track[%i].edit_count = %i\n", c->fc->nb_streams-1, edit_count);
 +    for (i = 0; i < edit_count && !pb->eof_reached; i++) {
 +        MOVElst *e = &sc->elst_data[i];
  
 -    for (i=0; i<edit_count; i++){
 -        int64_t time;
 -        int64_t duration;
          if (version == 1) {
 -            duration = avio_rb64(pb);
 -            time     = avio_rb64(pb);
 +            e->duration = avio_rb64(pb);
 +            e->time     = avio_rb64(pb);
          } else {
 -            duration = avio_rb32(pb); /* segment duration */
 -            time     = (int32_t)avio_rb32(pb); /* media time */
 +            e->duration = avio_rb32(pb); /* segment duration */
 +            e->time     = (int32_t)avio_rb32(pb); /* media time */
 +        }
 +        e->rate = avio_rb32(pb) / 65536.0;
-         av_dlog(c->fc, "duration=%"PRId64" time=%"PRId64" rate=%f\n",
++        av_log(c->fc, AV_LOG_TRACE, "duration=%"PRId64" time=%"PRId64" rate=%f\n",
 +                e->duration, e->time, e->rate);
 +    }
 +    sc->elst_count = i;
 +
 +    return 0;
 +}
 +
 +static int mov_read_tmcd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 +{
 +    MOVStreamContext *sc;
 +
 +    if (c->fc->nb_streams < 1)
 +        return AVERROR_INVALIDDATA;
 +    sc = c->fc->streams[c->fc->nb_streams - 1]->priv_data;
 +    sc->timecode_track = avio_rb32(pb);
 +    return 0;
 +}
 +
 +static int mov_read_uuid(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 +{
 +    int ret;
 +    uint8_t uuid[16];
 +    static const uint8_t uuid_isml_manifest[] = {
 +        0xa5, 0xd4, 0x0b, 0x30, 0xe8, 0x14, 0x11, 0xdd,
 +        0xba, 0x2f, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66
 +    };
 +
 +    if (atom.size < sizeof(uuid) || atom.size == INT64_MAX)
 +        return AVERROR_INVALIDDATA;
 +
 +    ret = avio_read(pb, uuid, sizeof(uuid));
 +    if (ret < 0) {
 +        return ret;
 +    } else if (ret != sizeof(uuid)) {
 +        return AVERROR_INVALIDDATA;
 +    }
 +    if (!memcmp(uuid, uuid_isml_manifest, sizeof(uuid))) {
 +        uint8_t *buffer, *ptr;
 +        char *endptr;
 +        size_t len = atom.size - sizeof(uuid);
 +
 +        if (len < 4) {
 +            return AVERROR_INVALIDDATA;
 +        }
 +        ret = avio_skip(pb, 4); // zeroes
 +        len -= 4;
 +
 +        buffer = av_mallocz(len + 1);
 +        if (!buffer) {
 +            return AVERROR(ENOMEM);
 +        }
 +        ret = avio_read(pb, buffer, len);
 +        if (ret < 0) {
 +            av_free(buffer);
 +            return ret;
 +        } else if (ret != len) {
 +            av_free(buffer);
 +            return AVERROR_INVALIDDATA;
          }
 -        avio_rb32(pb); /* Media rate */
 -        if (i == 0 && time >= -1) {
 -            sc->time_offset = time != -1 ? time : -duration;
 +
 +        ptr = buffer;
 +        while ((ptr = av_stristr(ptr, "systemBitrate=\""))) {
 +            ptr += sizeof("systemBitrate=\"") - 1;
 +            c->bitrates_count++;
 +            c->bitrates = av_realloc_f(c->bitrates, c->bitrates_count, sizeof(*c->bitrates));
 +            if (!c->bitrates) {
 +                c->bitrates_count = 0;
 +                av_free(buffer);
 +                return AVERROR(ENOMEM);
 +            }
 +            errno = 0;
 +            ret = strtol(ptr, &endptr, 10);
 +            if (ret < 0 || errno || *endptr != '"') {
 +                c->bitrates[c->bitrates_count - 1] = 0;
 +            } else {
 +                c->bitrates[c->bitrates_count - 1] = ret;
 +            }
          }
 +
 +        av_free(buffer);
      }
 +    return 0;
 +}
  
 -    if (edit_count > 1)
 -        av_log(c->fc, AV_LOG_WARNING, "multiple edit list entries, "
 -               "a/v desync might occur, patch welcome\n");
 +static int mov_read_free(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 +{
 +    int ret;
 +    uint8_t content[16];
 +
 +    if (atom.size < 8)
 +        return 0;
 +
 +    ret = avio_read(pb, content, FFMIN(sizeof(content), atom.size));
 +    if (ret < 0)
 +        return ret;
 +
 +    if (   !c->found_moov
 +        && !c->found_mdat
 +        && !memcmp(content, "Anevia\x1A\x1A", 8)
 +        && c->use_mfra_for == FF_MOV_FLAG_MFRA_AUTO) {
 +        c->use_mfra_for = FF_MOV_FLAG_MFRA_PTS;
 +    }
  
 -    av_log(c->fc, AV_LOG_TRACE, "track[%i].edit_count = %i\n", c->fc->nb_streams-1, edit_count);
      return 0;
  }
  
@@@ -3546,40 -3017,18 +3547,40 @@@ static int mov_read_default(MOVContext 
          if (atom.size >= 8) {
              a.size = avio_rb32(pb);
              a.type = avio_rl32(pb);
 +            if (a.type == MKTAG('f','r','e','e') &&
 +                a.size >= 8 &&
 +                c->moov_retry) {
 +                uint8_t buf[8];
 +                uint32_t *type = (uint32_t *)buf + 1;
 +                avio_read(pb, buf, 8);
 +                avio_seek(pb, -8, SEEK_CUR);
 +                if (*type == MKTAG('m','v','h','d') ||
 +                    *type == MKTAG('c','m','o','v')) {
 +                    av_log(c->fc, AV_LOG_ERROR, "Detected moov in a free atom.\n");
 +                    a.type = MKTAG('m','o','o','v');
 +                }
 +            }
 +            if (atom.type != MKTAG('r','o','o','t') &&
 +                atom.type != MKTAG('m','o','o','v'))
 +            {
 +                if (a.type == MKTAG('t','r','a','k') || a.type == MKTAG('m','d','a','t'))
 +                {
 +                    av_log(c->fc, AV_LOG_ERROR, "Broken file, trak/mdat not at top-level\n");
 +                    avio_skip(pb, -8);
 +                    c->atom_depth --;
 +                    return 0;
 +                }
 +            }
 +            total_size += 8;
 +            if (a.size == 1 && total_size + 8 <= atom.size) { /* 64 bit extended size */
 +                a.size = avio_rb64(pb) - 8;
 +                total_size += 8;
 +            }
          }
-         av_dlog(c->fc, "type: %08x '%.4s' parent:'%.4s' sz: %"PRId64" %"PRId64" %"PRId64"\n",
+         av_log(c->fc, AV_LOG_TRACE, "type: %08x '%.4s' parent:'%.4s' sz: %"PRId64" %"PRId64" %"PRId64"\n",
                  a.type, (char*)&a.type, (char*)&atom.type, a.size, total_size, atom.size);
 -        total_size += 8;
 -        if (a.size == 1) { /* 64 bit extended size */
 -            a.size = avio_rb64(pb) - 8;
 -            total_size += 8;
 -        }
          if (a.size == 0) {
 -            a.size = atom.size - total_size;
 -            if (a.size <= 8)
 -                break;
 +            a.size = atom.size - total_size + 8;
          }
          a.size -= 8;
          if (a.size < 0)
@@@ -4058,17 -3259,11 +4059,17 @@@ static int mov_read_header(AVFormatCont
          mov_read_close(s);
          return AVERROR_INVALIDDATA;
      }
-     av_dlog(mov->fc, "on_parse_exit_offset=%"PRId64"\n", avio_tell(pb));
+     av_log(mov->fc, AV_LOG_TRACE, "on_parse_exit_offset=%"PRId64"\n", avio_tell(pb));
  
 -    if (pb->seekable && mov->chapter_track > 0)
 -        mov_read_chapters(s);
 +    if (pb->seekable) {
 +        if (mov->chapter_track > 0)
 +            mov_read_chapters(s);
 +        for (i = 0; i < s->nb_streams; i++)
 +            if (s->streams[i]->codec->codec_tag == AV_RL32("tmcd"))
 +                mov_read_timecode_track(s, s->streams[i]);
 +    }
  
 +    /* copy timecode metadata from tmcd tracks to the related video streams */
      for (i = 0; i < s->nb_streams; i++) {
          AVStream *st = s->streams[i];
          MOVStreamContext *sc = st->priv_data;
@@@ -4219,9 -3368,9 +4220,9 @@@ static int mov_read_packet(AVFormatCont
          avio_seek(s->pb, mov->next_root_atom, SEEK_SET);
          mov->next_root_atom = 0;
          if (mov_read_default(mov, s->pb, (MOVAtom){ AV_RL32("root"), INT64_MAX }) < 0 ||
 -            s->pb->eof_reached)
 +            avio_feof(s->pb))
              return AVERROR_EOF;
-         av_dlog(s, "read fragments, offset 0x%"PRIx64"\n", avio_tell(s->pb));
+         av_log(s, AV_LOG_TRACE, "read fragments, offset 0x%"PRIx64"\n", avio_tell(s->pb));
          goto retry;
      }
      sc = st->priv_data;
Simple merge
Simple merge
@@@ -1008,29 -986,21 +1008,29 @@@ retry
              PacketDesc *pkt_desc = stream->predecode_packet;
              if (pkt_desc && pkt_desc->dts < best_dts)
                  best_dts = pkt_desc->dts;
 +            has_premux |= !!stream->premux_packet;
          }
  
 -        av_log(ctx, AV_LOG_TRACE, "bumping scr, scr:%f, dts:%f\n",
 -                scr / 90000.0, best_dts / 90000.0);
 -        if (best_dts == INT64_MAX)
 -            return 0;
 +        if (best_dts < INT64_MAX) {
-             av_dlog(ctx, "bumping scr, scr:%f, dts:%f\n",
++            av_log(ctx, AV_LOG_TRACE, "bumping scr, scr:%f, dts:%f\n",
 +                    scr / 90000.0, best_dts / 90000.0);
  
 -        if (scr >= best_dts + 1 && !ignore_constraints) {
 +            if (scr >= best_dts + 1 && !ignore_constraints) {
 +                av_log(ctx, AV_LOG_ERROR,
 +                    "packet too large, ignoring buffer limits to mux it\n");
 +                ignore_constraints = 1;
 +            }
 +            scr = FFMAX(best_dts + 1, scr);
 +            if (remove_decoded_packets(ctx, scr) < 0)
 +                return -1;
 +        } else if (has_premux && flush) {
              av_log(ctx, AV_LOG_ERROR,
 -                   "packet too large, ignoring buffer limits to mux it\n");
 +                  "delay too large, ignoring ...\n");
 +            ignore_delay = 1;
              ignore_constraints = 1;
 -        }
 -        scr = FFMAX(best_dts + 1, scr);
 -        if (remove_decoded_packets(ctx, scr) < 0)
 -            return -1;
 +        } else
 +            return 0;
 +
          goto retry;
      }
  
@@@ -1116,23 -1084,15 +1116,23 @@@ static int mpeg_mux_write_packet(AVForm
      pts = pkt->pts;
      dts = pkt->dts;
  
 -    if (pts != AV_NOPTS_VALUE)
 -        pts += 2 * preload;
 -    if (dts != AV_NOPTS_VALUE) {
 -        if (!s->last_scr)
 -            s->last_scr = dts + preload;
 -        dts += 2 * preload;
 +    if (s->last_scr == AV_NOPTS_VALUE) {
 +        if (dts == AV_NOPTS_VALUE || (dts < preload && ctx->avoid_negative_ts) || s->is_dvd) {
 +            if (dts != AV_NOPTS_VALUE)
 +                s->preload += av_rescale(-dts, AV_TIME_BASE, 90000);
 +            s->last_scr = 0;
 +        } else {
 +            s->last_scr = dts - preload;
 +            s->preload = 0;
 +        }
 +        preload = av_rescale(s->preload, 90000, AV_TIME_BASE);
 +        av_log(ctx, AV_LOG_DEBUG, "First SCR: %"PRId64" First DTS: %"PRId64"\n", s->last_scr, dts + preload);
      }
  
-     av_dlog(ctx, "dts:%f pts:%f flags:%d stream:%d nopts:%d\n",
 +    if (dts != AV_NOPTS_VALUE) dts += preload;
 +    if (pts != AV_NOPTS_VALUE) pts += preload;
 +
+     av_log(ctx, AV_LOG_TRACE, "dts:%f pts:%f flags:%d stream:%d nopts:%d\n",
              dts / 90000.0, pts / 90000.0, pkt->flags,
              pkt->stream_index, pts != AV_NOPTS_VALUE);
      if (!stream->premux_packet)
@@@ -430,12 -344,16 +430,12 @@@ static void write_section_data(MpegTSCo
      }
  }
  
 -static MpegTSFilter *mpegts_open_section_filter(MpegTSContext *ts,
 -                                                unsigned int pid,
 -                                                SectionCallback *section_cb,
 -                                                void *opaque,
 -                                                int check_crc)
 +static MpegTSFilter *mpegts_open_filter(MpegTSContext *ts, unsigned int pid,
 +                                        enum MpegTSFilterType type)
  {
      MpegTSFilter *filter;
 -    MpegTSSectionFilter *sec;
  
-     av_dlog(ts->stream, "Filter: pid=0x%x\n", pid);
+     av_log(ts->stream, AV_LOG_TRACE, "Filter: pid=0x%x\n", pid);
  
      if (pid >= NB_PID_MAX || ts->pids[pid])
          return NULL;
@@@ -1014,8 -869,8 +1014,8 @@@ static int mpegts_push_data(MpegTSFilte
                          code != 0x1ff && code != 0x1f2 && /* program_stream_directory, DSMCC_stream */
                          code != 0x1f8) {                  /* ITU-T Rec. H.222.1 type E stream */
                          pes->state = MPEGTS_PESHEADER;
 -                        if (pes->st->codec->codec_id == AV_CODEC_ID_NONE) {
 +                        if (pes->st->codec->codec_id == AV_CODEC_ID_NONE && !pes->st->request_probe) {
-                             av_dlog(pes->stream,
+                             av_log(pes->stream, AV_LOG_TRACE,
                                      "pid=%x stream_type=%x probing\n",
                                      pes->pid,
                                      pes->stream_type);
@@@ -1552,9 -1356,9 +1552,9 @@@ int ff_parse_mpeg2_descriptor(AVFormatC
      if (desc_end > desc_list_end)
          return AVERROR_INVALIDDATA;
  
-     av_dlog(fc, "tag: 0x%02x len=%d\n", desc_tag, desc_len);
+     av_log(fc, AV_LOG_TRACE, "tag: 0x%02x len=%d\n", desc_tag, desc_len);
  
 -    if (st->codec->codec_id == AV_CODEC_ID_NONE &&
 +    if ((st->codec->codec_id == AV_CODEC_ID_NONE || st->request_probe > 0) &&
          stream_type == STREAM_TYPE_PRIVATE_DATA)
          mpegts_find_stream_type(st, desc_tag, DESC_types);
  
@@@ -1807,8 -1527,8 +1807,8 @@@ static void pmt_cb(MpegTSFilter *filter
      if (parse_section_header(h, &p, p_end) < 0)
          return;
  
-     av_dlog(ts->stream, "sid=0x%x sec_num=%d/%d version=%d\n",
 -    av_log(ts->stream, AV_LOG_TRACE, "sid=0x%x sec_num=%d/%d\n",
 -            h->id, h->sec_num, h->last_sec_num);
++    av_log(ts->stream, AV_LOG_TRACE, "sid=0x%x sec_num=%d/%d version=%d\n",
 +            h->id, h->sec_num, h->last_sec_num, h->version);
  
      if (h->tid != PMT_TID)
          return;
          return;
      pcr_pid &= 0x1fff;
      add_pid_to_pmt(ts, h->id, pcr_pid);
 +    set_pcr_pid(ts->stream, h->id, pcr_pid);
  
-     av_dlog(ts->stream, "pcr_pid=0x%x\n", pcr_pid);
+     av_log(ts->stream, AV_LOG_TRACE, "pcr_pid=0x%x\n", pcr_pid);
  
      program_info_length = get16(&p, p_end);
      if (program_info_length < 0)
@@@ -1958,9 -1660,8 +1958,9 @@@ static void pat_cb(MpegTSFilter *filter
      SectionHeader h1, *h = &h1;
      const uint8_t *p, *p_end;
      int sid, pmt_pid;
 +    AVProgram *program;
  
-     av_dlog(ts->stream, "PAT:\n");
+     av_log(ts->stream, AV_LOG_TRACE, "PAT:\n");
      hex_dump_debug(ts->stream, section, section_len);
  
      p_end = section + section_len - 4;
              break;
          pmt_pid &= 0x1fff;
  
-         av_dlog(ts->stream, "sid=0x%x pid=0x%x\n", sid, pmt_pid);
 +        if (pmt_pid == ts->current_pid)
 +            break;
 +
+         av_log(ts->stream, AV_LOG_TRACE, "sid=0x%x pid=0x%x\n", sid, pmt_pid);
  
          if (sid == 0x0000) {
              /* NIT info */
@@@ -2069,10 -1740,10 +2069,10 @@@ static void sdt_cb(MpegTSFilter *filter
                  break;
              desc_len = get8(&p, desc_list_end);
              desc_end = p + desc_len;
 -            if (desc_end > desc_list_end)
 +            if (desc_len < 0 || desc_end > desc_list_end)
                  break;
  
-             av_dlog(ts->stream, "tag: 0x%02x len=%d\n",
+             av_log(ts->stream, AV_LOG_TRACE, "tag: 0x%02x len=%d\n",
                      desc_tag, desc_len);
  
              switch (desc_tag) {
@@@ -1281,9 -1071,7 +1281,9 @@@ static int mpegts_write_packet_internal
  
          do {
              p = avpriv_find_start_code(p, buf_end, &state);
-             av_dlog(s, "nal %d\n", state & 0x1f);
+             av_log(s, AV_LOG_TRACE, "nal %d\n", state & 0x1f);
 +            if ((state & 0x1f) == 7)
 +                extradd = 0;
          } while (p < buf_end && (state & 0x1f) != 9 &&
                   (state & 0x1f) != 5 && (state & 0x1f) != 1);
  
@@@ -438,18 -261,14 +438,18 @@@ int avformat_write_header(AVFormatConte
  //FIXME merge with compute_pkt_fields
  static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt)
  {
 -    int delay = FFMAX(st->codec->has_b_frames, !!st->codec->max_b_frames);
 +    int delay = FFMAX(st->codec->has_b_frames, st->codec->max_b_frames > 0);
      int num, den, i;
 +    int frame_size;
  
-     av_dlog(s, "compute_pkt_fields2: pts:%s dts:%s cur_dts:%s b:%d size:%d st:%d\n",
 -    av_log(s, AV_LOG_TRACE, "compute_pkt_fields2: pts:%" PRId64 " dts:%" PRId64 " cur_dts:%" PRId64 " b:%d size:%d st:%d\n",
 -            pkt->pts, pkt->dts, st->cur_dts, delay, pkt->size, pkt->stream_index);
++    av_log(s, AV_LOG_TRACE, "compute_pkt_fields2: pts:%s dts:%s cur_dts:%s b:%d size:%d st:%d\n",
 +            av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), delay, pkt->size, pkt->stream_index);
  
 -/*    if(pkt->pts == AV_NOPTS_VALUE && pkt->dts == AV_NOPTS_VALUE)
 - *      return AVERROR(EINVAL);*/
 +    if (pkt->duration < 0 && st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) {
 +        av_log(s, AV_LOG_WARNING, "Packet with invalid duration %d in stream %d\n",
 +               pkt->duration, pkt->stream_index);
 +        pkt->duration = 0;
 +    }
  
      /* duration field */
      if (pkt->duration == 0) {
          return AVERROR(EINVAL);
      }
  
-     av_dlog(s, "av_write_frame: pts2:%s dts2:%s\n",
 -    av_log(s, AV_LOG_TRACE, "av_write_frame: pts2:%"PRId64" dts2:%"PRId64"\n",
 -            pkt->pts, pkt->dts);
++    av_log(s, AV_LOG_TRACE, "av_write_frame: pts2:%s dts2:%s\n",
 +            av_ts2str(pkt->pts), av_ts2str(pkt->dts));
      st->cur_dts = pkt->dts;
 -
 +    st->pts.val = pkt->dts;
 +
 +    /* update pts */
 +    switch (st->codec->codec_type) {
 +    case AVMEDIA_TYPE_AUDIO:
 +        frame_size = (pkt->flags & AV_PKT_FLAG_UNCODED_FRAME) ?
 +                     ((AVFrame *)pkt->data)->nb_samples :
 +                     av_get_audio_frame_duration(st->codec, pkt->size);
 +
 +        /* HACK/FIXME, we skip the initial 0 size packets as they are most
 +         * likely equal to the encoder delay, but it would be better if we
 +         * had the real timestamps from the encoder */
 +        if (frame_size >= 0 && (pkt->size || st->pts.num != st->pts.den >> 1 || st->pts.val)) {
 +            frac_add(&st->pts, (int64_t)st->time_base.den * frame_size);
 +        }
 +        break;
 +    case AVMEDIA_TYPE_VIDEO:
 +        frac_add(&st->pts, (int64_t)st->time_base.den * st->codec->time_base.num);
 +        break;
 +    }
      return 0;
  }
  
@@@ -876,8 -560,8 +876,8 @@@ int av_interleaved_write_frame(AVFormat
      if (pkt) {
          AVStream *st = s->streams[pkt->stream_index];
  
-         av_dlog(s, "av_interleaved_write_frame size:%d dts:%s pts:%s\n",
 -        av_log(s, AV_LOG_TRACE, "av_interleaved_write_frame size:%d dts:%" PRId64 " pts:%" PRId64 "\n",
 -                pkt->size, pkt->dts, pkt->pts);
++        av_log(s, AV_LOG_TRACE, "av_interleaved_write_frame size:%d dts:%s pts:%s\n",
 +                pkt->size, av_ts2str(pkt->dts), av_ts2str(pkt->pts));
          if ((ret = compute_pkt_fields2(s, st, pkt)) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS))
              goto fail;
  
@@@ -1778,9 -1366,10 +1778,9 @@@ static int mxf_parse_physical_source_pa
  static int mxf_parse_structural_metadata(MXFContext *mxf)
  {
      MXFPackage *material_package = NULL;
 -    MXFPackage *temp_package = NULL;
      int i, j, k, ret;
  
-     av_dlog(mxf->fc, "metadata sets count %d\n", mxf->metadata_sets_count);
+     av_log(mxf->fc, AV_LOG_TRACE, "metadata sets count %d\n", mxf->metadata_sets_count);
      /* TODO: handle multiple material packages (OP3x) */
      for (i = 0; i < mxf->packages_count; i++) {
          material_package = mxf_resolve_strong_ref(mxf, &mxf->packages_refs[i], MaterialPackage);
              if (!component)
                  continue;
  
 -            for (k = 0; k < mxf->packages_count; k++) {
 -                temp_package = mxf_resolve_strong_ref(mxf, &mxf->packages_refs[k], SourcePackage);
 -                if (!temp_package)
 -                    continue;
 -                if (!memcmp(temp_package->package_uid, component->source_package_uid, 16)) {
 -                    source_package = temp_package;
 -                    break;
 -                }
 +            mxf_tc = (MXFTimecodeComponent*)component;
 +            flags = mxf_tc->drop_frame == 1 ? AV_TIMECODE_FLAG_DROPFRAME : 0;
 +            if (av_timecode_init(&tc, mxf_tc->rate, flags, mxf_tc->start_frame, mxf->fc) == 0) {
 +                mxf_add_timecode_metadata(&mxf->fc->metadata, "timecode", &tc);
 +                break;
              }
 +        }
 +
 +        /* TODO: handle multiple source clips */
 +        for (j = 0; j < material_track->sequence->structural_components_count; j++) {
 +            component = mxf_resolve_sourceclip(mxf, &material_track->sequence->structural_components_refs[j]);
 +            if (!component)
 +                continue;
 +
 +            source_package = mxf_resolve_source_package(mxf, component->source_package_uid);
              if (!source_package) {
-                 av_dlog(mxf->fc, "material track %d: no corresponding source package found\n", material_track->track_id);
+                 av_log(mxf->fc, AV_LOG_TRACE, "material track %d: no corresponding source package found\n", material_track->track_id);
                  break;
              }
              for (k = 0; k < source_package->tracks_count; k++) {
@@@ -2379,34 -1903,8 +2379,34 @@@ static int mxf_seek_to_previous_partiti
      avio_seek(pb, mxf->run_in + mxf->current_partition->previous_partition, SEEK_SET);
      mxf->current_partition = NULL;
  
-     av_dlog(mxf->fc, "seeking to previous partition\n");
+     av_log(mxf->fc, AV_LOG_TRACE, "seeking to previous partition\n");
  
 +    /* Make sure this is actually a PartitionPack, and if so parse it.
 +     * See deadlock2.mxf
 +     */
 +    if ((ret = klv_read_packet(&klv, pb)) < 0) {
 +        av_log(mxf->fc, AV_LOG_ERROR, "failed to read PartitionPack KLV\n");
 +        return ret;
 +    }
 +
 +    if (!mxf_is_partition_pack_key(klv.key)) {
 +        av_log(mxf->fc, AV_LOG_ERROR, "PreviousPartition @ %" PRIx64 " isn't a PartitionPack\n", klv.offset);
 +        return AVERROR_INVALIDDATA;
 +    }
 +
 +    /* We can't just check ofs >= current_partition_ofs because PreviousPartition
 +     * can point to just before the current partition, causing klv_read_packet()
 +     * to sync back up to it. See deadlock3.mxf
 +     */
 +    if (klv.offset >= current_partition_ofs) {
 +        av_log(mxf->fc, AV_LOG_ERROR, "PreviousPartition for PartitionPack @ %"
 +               PRIx64 " indirectly points to itself\n", current_partition_ofs);
 +        return AVERROR_INVALIDDATA;
 +    }
 +
 +    if ((ret = mxf_parse_klv(mxf, klv, mxf_read_partition_pack, 0, 0)) < 0)
 +        return ret;
 +
      return 1;
  }
  
@@@ -2422,12 -1920,15 +2422,12 @@@ static int mxf_parse_handle_essence(MXF
      if (mxf->parsing_backward) {
          return mxf_seek_to_previous_partition(mxf);
      } else {
 -        uint64_t offset = mxf->footer_partition ? mxf->footer_partition
 -                                                : mxf->last_partition;
 -
 -        if (!offset) {
 -            av_log(mxf->fc, AV_LOG_TRACE, "no last partition\n");
 +        if (!mxf->footer_partition) {
-             av_dlog(mxf->fc, "no FooterPartition\n");
++            av_log(mxf->fc, AV_LOG_TRACE, "no FooterPartition\n");
              return 0;
          }
  
-         av_dlog(mxf->fc, "seeking to FooterPartition\n");
 -        av_log(mxf->fc, AV_LOG_TRACE, "seeking to last partition\n");
++        av_log(mxf->fc, AV_LOG_TRACE, "seeking to FooterPartition\n");
  
          /* remember where we were so we don't end up seeking further back than this */
          mxf->last_forward_tell = avio_tell(pb);
@@@ -2889,9 -2339,11 +2889,9 @@@ static int mxf_read_packet_old(AVFormat
      MXFContext *mxf = s->priv_data;
      int ret;
  
 -    while (!s->pb->eof_reached) {
 -        if ((ret = klv_read_packet(&klv, s->pb)) < 0)
 -            return ret;
 +    while ((ret = klv_read_packet(&klv, s->pb)) == 0) {
          PRINT_KEY(s, "read packet", klv.key);
-         av_dlog(s, "size %"PRIu64" offset %#"PRIx64"\n", klv.length, klv.offset);
+         av_log(s, AV_LOG_TRACE, "size %"PRIu64" offset %#"PRIx64"\n", klv.length, klv.offset);
          if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key)) {
              ret = mxf_decrypt_triplet(s, pkt, &klv);
              if (ret < 0) {
Simple merge
@@@ -232,8 -233,8 +232,8 @@@ static int nsv_resync(AVFormatContext *
      //nsv->state = NSV_UNSYNC;
  
      for (i = 0; i < NSV_MAX_RESYNC; i++) {
 -        if (pb->eof_reached) {
 +        if (avio_feof(pb)) {
-             av_dlog(s, "NSV EOF\n");
+             av_log(s, AV_LOG_TRACE, "NSV EOF\n");
              nsv->state = NSV_UNSYNC;
              return -1;
          }
@@@ -297,12 -298,12 +297,12 @@@ static int nsv_parse_NSVf_header(AVForm
      strings_size = avio_rl32(pb);
      table_entries = avio_rl32(pb);
      table_entries_used = avio_rl32(pb);
-     av_dlog(s, "NSV NSVf info-strings size: %d, table entries: %d, bis %d\n",
+     av_log(s, AV_LOG_TRACE, "NSV NSVf info-strings size: %d, table entries: %d, bis %d\n",
              strings_size, table_entries, table_entries_used);
 -    if (pb->eof_reached)
 +    if (avio_feof(pb))
          return -1;
  
-     av_dlog(s, "NSV got header; filepos %"PRId64"\n", avio_tell(pb));
+     av_log(s, AV_LOG_TRACE, "NSV got header; filepos %"PRId64"\n", avio_tell(pb));
  
      if (strings_size > 0) {
          char *strings; /* last byte will be '\0' to play safe with str*() */
          }
          av_free(strings);
      }
 -    if (pb->eof_reached)
 +    if (avio_feof(pb))
          return -1;
  
-     av_dlog(s, "NSV got infos; filepos %"PRId64"\n", avio_tell(pb));
+     av_log(s, AV_LOG_TRACE, "NSV got infos; filepos %"PRId64"\n", avio_tell(pb));
  
      if (table_entries_used > 0) {
          int i;
@@@ -539,9 -540,8 +539,9 @@@ static int nsv_read_chunk(AVFormatConte
      uint32_t vsize;
      uint16_t asize;
      uint16_t auxsize;
 +    int ret;
  
-     av_dlog(s, "%s(%d)\n", __FUNCTION__, fill_header);
+     av_log(s, AV_LOG_TRACE, "%s(%d)\n", __FUNCTION__, fill_header);
  
      if (nsv->ahead[0].data || nsv->ahead[1].data)
          return 0; //-1; /* hey! eat what you've in your plate first! */
@@@ -637,11 -636,10 +637,11 @@@ null_chunk_retry
                  channels = 1;
                  st[NSV_ST_AUDIO]->codec->channels = channels;
                  st[NSV_ST_AUDIO]->codec->sample_rate = samplerate;
-                 av_dlog(s, "NSV RAWAUDIO: bps %d, nchan %d, srate %d\n", bps, channels, samplerate);
+                 av_log(s, AV_LOG_TRACE, "NSV RAWAUDIO: bps %d, nchan %d, srate %d\n", bps, channels, samplerate);
              }
          }
 -        av_get_packet(pb, pkt, asize);
 +        if ((ret = av_get_packet(pb, pkt, asize)) < 0)
 +            return ret;
          pkt->stream_index = st[NSV_ST_AUDIO]->index;//NSV_ST_AUDIO;
          pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? AV_PKT_FLAG_KEY : 0; /* keyframe only likely on a sync frame */
          if( nsv->state == NSV_HAS_READ_NSVS && st[NSV_ST_VIDEO] ) {
@@@ -721,9 -719,11 +721,9 @@@ static int nsv_read_close(AVFormatConte
  
  static int nsv_probe(AVProbeData *p)
  {
 -    int i;
 -    int score;
 -    int vsize, asize, auxcount;
 -    score = 0;
 +    int i, score = 0;
 +
-     av_dlog(NULL, "nsv_probe(), buf_size %d\n", p->buf_size);
+     av_log(NULL, AV_LOG_TRACE, "nsv_probe(), buf_size %d\n", p->buf_size);
      /* check file header */
      /* streamed files might not have any header */
      if (p->buf[0] == 'N' && p->buf[1] == 'S' &&
@@@ -455,9 -344,7 +455,9 @@@ static int ogg_packet(AVFormatContext *
      int complete = 0;
      int segp     = 0, psize = 0;
  
-     av_dlog(s, "ogg_packet: curidx=%i\n", ogg->curidx);
+     av_log(s, AV_LOG_TRACE, "ogg_packet: curidx=%i\n", ogg->curidx);
 +    if (sid)
 +        *sid = -1;
  
      do {
          idx = ogg->curidx;
@@@ -674,37 -557,17 +674,37 @@@ static int ogg_read_header(AVFormatCont
  {
      struct ogg *ogg = s->priv_data;
      int ret, i;
 +
      ogg->curidx = -1;
 +
      //linear headers seek from start
 -    ret = ogg_get_headers(s);
 -    if (ret < 0) {
 -        ogg_read_close(s);
 -        return ret;
 -    }
 +    do {
 +        ret = ogg_packet(s, NULL, NULL, NULL, NULL);
 +        if (ret < 0) {
 +            ogg_read_close(s);
 +            return ret;
 +        }
 +    } while (!ogg->headers);
-     av_dlog(s, "found headers\n");
++    av_log(s, AV_LOG_TRACE, "found headers\n");
  
 -    for (i = 0; i < ogg->nstreams; i++)
 -        if (ogg->streams[i].header < 0)
 +    for (i = 0; i < ogg->nstreams; i++) {
 +        struct ogg_stream *os = ogg->streams + i;
 +
 +        if (ogg->streams[i].header < 0) {
 +            av_log(s, AV_LOG_ERROR, "Header parsing failed for stream %d\n", i);
              ogg->streams[i].codec = NULL;
 +        } else if (os->codec && os->nb_header < os->codec->nb_header) {
 +            av_log(s, AV_LOG_WARNING,
 +                   "Headers mismatch for stream %d: "
 +                   "expected %d received %d.\n",
 +                   i, os->codec->nb_header, os->nb_header);
 +            if (s->error_recognition & AV_EF_EXPLODE)
 +                return AVERROR_INVALIDDATA;
 +        }
 +        if (os->start_granule != OGG_NOGRANULE_VALUE)
 +            os->lastpts = s->streams[i]->start_time =
 +                ogg_gptopts(s, i, os->start_granule, NULL);
 +    }
  
      //linear granulepos seek from end
      ogg_get_length(s);
@@@ -139,9 -136,10 +139,9 @@@ static int r3d_read_rdvo(AVFormatContex
  
      if (st->avg_frame_rate.num)
          st->duration = av_rescale_q(r3d->video_offsets_count,
 -                                    (AVRational){st->avg_frame_rate.den,
 -                                                 st->avg_frame_rate.num},
 +                                    av_inv_q(st->avg_frame_rate),
                                      st->time_base);
-     av_dlog(s, "duration %"PRId64"\n", st->duration);
+     av_log(s, AV_LOG_TRACE, "duration %"PRId64"\n", st->duration);
  
      return 0;
  }
@@@ -314,9 -312,8 +314,9 @@@ static int r3d_read_reda(AVFormatContex
  
      pkt->stream_index = 1;
      pkt->dts = dts;
 -    pkt->duration = av_rescale(samples, st->time_base.den, st->codec->sample_rate);
 +    if (st->codec->sample_rate)
 +        pkt->duration = av_rescale(samples, st->time_base.den, st->codec->sample_rate);
-     av_dlog(s, "pkt dts %"PRId64" duration %d samples %d sample rate %d\n",
+     av_log(s, AV_LOG_TRACE, "pkt dts %"PRId64" duration %d samples %d sample rate %d\n",
              pkt->dts, pkt->duration, samples, st->codec->sample_rate);
  
      return 0;
@@@ -372,8 -369,8 +372,8 @@@ static int r3d_seek(AVFormatContext *s
          return -1;
  
      frame_num = av_rescale_q(sample_time, st->time_base,
 -                             (AVRational){st->avg_frame_rate.den, st->avg_frame_rate.num});
 +                             av_inv_q(st->avg_frame_rate));
-     av_dlog(s, "seek frame num %d timestamp %"PRId64"\n",
+     av_log(s, AV_LOG_TRACE, "seek frame num %d timestamp %"PRId64"\n",
              frame_num, sample_time);
  
      if (frame_num < r3d->video_offsets_count) {
Simple merge
Simple merge
Simple merge
@@@ -309,18 -305,14 +309,18 @@@ static int hevc_handle_packet(AVFormatC
              len -= RTP_HEVC_DONL_FIELD_SIZE;
          }
  
-         av_dlog(ctx, " FU type %d with %d bytes\n", fu_type, len);
+         av_log(ctx, AV_LOG_TRACE, " FU type %d with %d bytes\n", fu_type, len);
  
 +        /* sanity check for size of input packet: 1 byte payload at least */
          if (len <= 0) {
 -            /* sanity check for size of input packet: 1 byte payload at least */
 -            av_log(ctx, AV_LOG_ERROR,
 -                   "Too short RTP/HEVC packet, got %d bytes of NAL unit type %d\n",
 -                   len, nal_type);
 -            return AVERROR_INVALIDDATA;
 +            if (len < 0) {
 +                av_log(ctx, AV_LOG_ERROR,
 +                       "Too short RTP/HEVC packet, got %d bytes of NAL unit type %d\n",
 +                       len, nal_type);
 +                return AVERROR_INVALIDDATA;
 +            } else {
 +                return AVERROR(EAGAIN);
 +            }
          }
  
          if (first_fragment && last_fragment) {
Simple merge
Simple merge
@@@ -772,8 -769,8 +772,8 @@@ redo
          return -1;
      id  = buf[0];
      len = AV_RB16(buf + 1);
-     av_dlog(s, "id=%d len=%d\n", id, len);
+     av_log(s, AV_LOG_TRACE, "id=%d len=%d\n", id, len);
 -    if (len > buf_size || len < 12)
 +    if (len > buf_size || len < 8)
          goto redo;
      /* get the data */
      ret = ffurl_read_complete(rt->rtsp_hd, buf, len);
@@@ -1085,14 -652,15 +1085,14 @@@ static void compute_pkt_fields(AVFormat
          pkt->pts > pkt->dts)
          presentation_delayed = 1;
  
-     av_dlog(NULL,
+     av_log(NULL, AV_LOG_TRACE,
 -            "IN delayed:%d pts:%"PRId64", dts:%"PRId64" "
 -            "cur_dts:%"PRId64" st:%d pc:%p\n",
 -            presentation_delayed, pkt->pts, pkt->dts, st->cur_dts,
 -            pkt->stream_index, pc);
 -    /* Interpolate PTS and DTS if they are not present. We skip H.264
 +            "IN delayed:%d pts:%s, dts:%s cur_dts:%s st:%d pc:%p duration:%d delay:%d onein_oneout:%d\n",
 +            presentation_delayed, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts),
 +            pkt->stream_index, pc, pkt->duration, delay, onein_oneout);
 +    /* Interpolate PTS and DTS if they are not present. We skip H264
       * currently because delay and has_b_frames are not reliably set. */
      if ((delay == 0 || (delay == 1 && pc)) &&
 -        st->codec->codec_id != AV_CODEC_ID_H264) {
 +        onein_oneout) {
          if (presentation_delayed) {
              /* DTS = decompression timestamp */
              /* PTS = presentation timestamp */
          st->pts_buffer[0] = pkt->pts;
          for (i = 0; i<delay && st->pts_buffer[i] > st->pts_buffer[i + 1]; i++)
              FFSWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i + 1]);
 -        if (pkt->dts == AV_NOPTS_VALUE)
 -            pkt->dts = st->pts_buffer[0];
 -        // We skipped it above so we try here.
 -        if (st->codec->codec_id == AV_CODEC_ID_H264)
 -            // This should happen on the first packet
 -            update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts);
 -        if (pkt->dts > st->cur_dts)
 -            st->cur_dts = pkt->dts;
 +
 +        pkt->dts = select_from_pts_buffer(st, st->pts_buffer, pkt->dts);
      }
 +    // We skipped it above so we try here.
 +    if (!onein_oneout)
 +        // This should happen on the first packet
 +        update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts, pkt);
 +    if (pkt->dts > st->cur_dts)
 +        st->cur_dts = pkt->dts;
  
-     av_dlog(NULL, "OUTdelayed:%d/%d pts:%s, dts:%s cur_dts:%s\n",
 -    av_log(NULL, AV_LOG_TRACE,
 -            "OUTdelayed:%d/%d pts:%"PRId64", dts:%"PRId64" cur_dts:%"PRId64"\n",
 -            presentation_delayed, delay, pkt->pts, pkt->dts, st->cur_dts);
++    av_log(NULL, AV_LOG_TRACE, "OUTdelayed:%d/%d pts:%s, dts:%s cur_dts:%s\n",
 +            presentation_delayed, delay, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts));
  
      /* update flags */
 -    if (is_intra_only(st->codec->codec_id))
 +    if (is_intra_only(st->codec))
          pkt->flags |= AV_PKT_FLAG_KEY;
      if (pc)
          pkt->convergence_duration = pc->convergence_duration;
@@@ -1798,7 -1220,7 +1798,7 @@@ int ff_seek_frame_binary(AVFormatContex
      if (stream_index < 0)
          return -1;
  
-     av_dlog(s, "read_seek: %d %s\n", stream_index, av_ts2str(target_ts));
 -    av_log(s, AV_LOG_TRACE, "read_seek: %d %"PRId64"\n", stream_index, target_ts);
++    av_log(s, AV_LOG_TRACE, "read_seek: %d %s\n", stream_index, av_ts2str(target_ts));
  
      ts_max =
      ts_min = AV_NOPTS_VALUE;
          if (e->timestamp <= target_ts || e->pos == e->min_distance) {
              pos_min = e->pos;
              ts_min  = e->timestamp;
-             av_dlog(s, "using cached pos_min=0x%"PRIx64" dts_min=%s\n",
 -            av_log(s, AV_LOG_TRACE, "using cached pos_min=0x%"PRIx64" dts_min=%"PRId64"\n",
 -                    pos_min, ts_min);
++            av_log(s, AV_LOG_TRACE, "using cached pos_min=0x%"PRIx64" dts_min=%s\n",
 +                    pos_min, av_ts2str(ts_min));
          } else {
 -            assert(index == 0);
 +            av_assert1(index == 0);
          }
  
          index = av_index_search_timestamp(st, target_ts,
              pos_max   = e->pos;
              ts_max    = e->timestamp;
              pos_limit = pos_max - e->min_distance;
-             av_dlog(s, "using cached pos_max=0x%"PRIx64" pos_limit=0x%"PRIx64
+             av_log(s, AV_LOG_TRACE, "using cached pos_max=0x%"PRIx64" pos_limit=0x%"PRIx64
 -                    " dts_max=%"PRId64"\n", pos_max, pos_limit, ts_max);
 +                    " dts_max=%s\n", pos_max, pos_limit, av_ts2str(ts_max));
          }
      }
  
@@@ -1899,11 -1282,10 +1899,11 @@@ int64_t ff_gen_search(AVFormatContext *
                                                  int64_t *, int64_t))
  {
      int64_t pos, ts;
 -    int64_t start_pos, filesize;
 +    int64_t start_pos;
      int no_change;
 +    int ret;
  
-     av_dlog(s, "gen_seek: %d %s\n", stream_index, av_ts2str(target_ts));
 -    av_log(s, AV_LOG_TRACE, "gen_seek: %d %"PRId64"\n", stream_index, target_ts);
++    av_log(s, AV_LOG_TRACE, "gen_seek: %d %s\n", stream_index, av_ts2str(target_ts));
  
      if (ts_min == AV_NOPTS_VALUE) {
          pos_min = s->internal->data_offset;
  
      no_change = 0;
      while (pos_min < pos_limit) {
-         av_dlog(s,
 -        av_log(s, AV_LOG_TRACE, "pos_min=0x%"PRIx64" pos_max=0x%"PRIx64" dts_min=%"PRId64
 -                " dts_max=%"PRId64"\n", pos_min, pos_max, ts_min, ts_max);
 -        assert(pos_limit <= pos_max);
++        av_log(s, AV_LOG_TRACE,
 +                "pos_min=0x%"PRIx64" pos_max=0x%"PRIx64" dts_min=%s dts_max=%s\n",
 +                pos_min, pos_max, av_ts2str(ts_min), av_ts2str(ts_max));
 +        av_assert0(pos_limit <= pos_max);
  
          if (no_change == 0) {
              int64_t approximate_keyframe_distance = pos_max - pos_limit;
              no_change++;
          else
              no_change = 0;
-         av_dlog(s, "%"PRId64" %"PRId64" %"PRId64" / %s %s %s"
 -        av_log(s, AV_LOG_TRACE, "%"PRId64" %"PRId64" %"PRId64" / %"PRId64" %"PRId64" %"PRId64
 -                " target:%"PRId64" limit:%"PRId64" start:%"PRId64" noc:%d\n",
 -                pos_min, pos, pos_max, ts_min, ts, ts_max, target_ts,
++        av_log(s, AV_LOG_TRACE, "%"PRId64" %"PRId64" %"PRId64" / %s %s %s"
 +                " target:%s limit:%"PRId64" start:%"PRId64" noc:%d\n",
 +                pos_min, pos, pos_max,
 +                av_ts2str(ts_min), av_ts2str(ts), av_ts2str(ts_max), av_ts2str(target_ts),
                  pos_limit, start_pos, no_change);
          if (ts == AV_NOPTS_VALUE) {
              av_log(s, AV_LOG_ERROR, "read_timestamp() failed in the middle\n");
  
      pos     = (flags & AVSEEK_FLAG_BACKWARD) ? pos_min : pos_max;
      ts      = (flags & AVSEEK_FLAG_BACKWARD) ? ts_min  : ts_max;
 +#if 0
      pos_min = pos;
 -    ts_min  = read_timestamp(s, stream_index, &pos_min, INT64_MAX);
 +    ts_min  = ff_read_timestamp(s, stream_index, &pos_min, INT64_MAX, read_timestamp);
      pos_min++;
 -    ts_max = read_timestamp(s, stream_index, &pos_min, INT64_MAX);
 -    av_log(s, AV_LOG_TRACE, "pos=0x%"PRIx64" %"PRId64"<=%"PRId64"<=%"PRId64"\n",
 -            pos, ts_min, target_ts, ts_max);
 +    ts_max = ff_read_timestamp(s, stream_index, &pos_min, INT64_MAX, read_timestamp);
-     av_dlog(s, "pos=0x%"PRIx64" %s<=%s<=%s\n",
++    av_log(s, AV_LOG_TRACE, "pos=0x%"PRIx64" %s<=%s<=%s\n",
 +            pos, av_ts2str(ts_min), av_ts2str(target_ts), av_ts2str(ts_max));
 +#endif
      *ts_ret = ts;
      return pos;
  }
Simple merge
Simple merge
Simple merge
Simple merge