Mercurial > libavformat.hg
annotate 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 |
rev | line source |
---|---|
937 | 1 /* |
2 * Creative Voice File demuxer. | |
3 * Copyright (c) 2006 Aurelien Jacobs <aurel@gnuage.org> | |
4 * | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
937
diff
changeset
|
5 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
937
diff
changeset
|
6 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
937
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
937 | 8 * modify it under the terms of the GNU Lesser General Public |
9 * License as published by the Free Software Foundation; either | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
937
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
937 | 11 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
937
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
937 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Lesser General Public | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
937
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
2217 | 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
937 | 20 */ |
21 | |
3852 | 22 #ifndef AVFORMAT_VOC_H |
23 #define AVFORMAT_VOC_H | |
937 | 24 |
25 #include "avformat.h" | |
1536 | 26 #include "riff.h" /* for CodecTag */ |
937 | 27 |
28 typedef struct voc_dec_context { | |
29 int remaining_size; | |
4081 | 30 } VocDecContext; |
937 | 31 |
1535 | 32 typedef enum voc_type { |
33 VOC_TYPE_EOF = 0x00, | |
34 VOC_TYPE_VOICE_DATA = 0x01, | |
35 VOC_TYPE_VOICE_DATA_CONT = 0x02, | |
36 VOC_TYPE_SILENCE = 0x03, | |
37 VOC_TYPE_MARKER = 0x04, | |
38 VOC_TYPE_ASCII = 0x05, | |
39 VOC_TYPE_REPETITION_START = 0x06, | |
40 VOC_TYPE_REPETITION_END = 0x07, | |
41 VOC_TYPE_EXTENDED = 0x08, | |
42 VOC_TYPE_NEW_VOICE_DATA = 0x09, | |
4081 | 43 } VocType; |
1535 | 44 |
3764 | 45 extern const unsigned char ff_voc_magic[21]; |
46 extern const AVCodecTag ff_voc_codec_tags[]; | |
1535 | 47 |
937 | 48 int voc_get_packet(AVFormatContext *s, AVPacket *pkt, |
49 AVStream *st, int max_size); | |
50 | |
3852 | 51 #endif /* AVFORMAT_VOC_H */ |