Mercurial > libavformat.hg
view voc.h @ 4633:0c69b895a01f libavformat
Don't let finalize_packet() touch pkt->stream_index. Instead, let individual
payload handlers take care of that themselves at their own option. What this
patch really does is "fix" a bug in MS-RTSP protocol where incoming packets
are always coming in over the connection (UDP) or interleave-id (TCP) of
the stream-id of the first ASF packet in the RTP packet. However, RTP packets
may contain multiple ASF packets (and usually do, from what I can see), and
therefore this leads to playback bugs. The intended stream-id per ASF packet
is given in the respective ASF packet header. The ASF demuxer will correctly
read this and set pkt->stream_index, but since the "stream" parameter can
not be known to rtpdec.c or any of the RTP/RTSP code, the "st" parameter
in all these functions is basically invalid. Therefore, using st->id as
pkt->stream_index leads to various playback bugs. The result of this patch
is that pkt->stream_index is left untouched for RTP/ASF (and possibly for
other payloads that have similar behaviour).
The patch was discussed in the "[PATCH] rtpdec.c: don't overwrite
pkt->stream_index in finalize_packet()" thread on the mailinglist.
author | rbultje |
---|---|
date | Tue, 03 Mar 2009 13:51:34 +0000 |
parents | 3d6e7901bf05 |
children | 3528d151a57e |
line wrap: on
line source
/* * Creative Voice File demuxer. * Copyright (c) 2006 Aurelien Jacobs <aurel@gnuage.org> * * 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 */ #ifndef AVFORMAT_VOC_H #define AVFORMAT_VOC_H #include "avformat.h" #include "riff.h" /* for CodecTag */ typedef struct voc_dec_context { int remaining_size; } VocDecContext; typedef enum voc_type { VOC_TYPE_EOF = 0x00, VOC_TYPE_VOICE_DATA = 0x01, VOC_TYPE_VOICE_DATA_CONT = 0x02, VOC_TYPE_SILENCE = 0x03, VOC_TYPE_MARKER = 0x04, VOC_TYPE_ASCII = 0x05, VOC_TYPE_REPETITION_START = 0x06, VOC_TYPE_REPETITION_END = 0x07, VOC_TYPE_EXTENDED = 0x08, VOC_TYPE_NEW_VOICE_DATA = 0x09, } VocType; extern const unsigned char ff_voc_magic[21]; extern const AVCodecTag ff_voc_codec_tags[]; int voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size); #endif /* AVFORMAT_VOC_H */