annotate rmdec.c @ 4144:4970ba98ca58 libavformat

Replace buffer by AVPacket and avoid a memcpy() for video when the number of allocated slices matches the actual. Audio still does a copy (marked with FIXME in the code so this is not missed).
author michael
date Wed, 31 Dec 2008 01:53:12 +0000
parents 6b3d9d41f18c
children c1c1a6d0d529
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
2103
95139f2053a9 split rm muxer and demuxer in their own files
aurel
parents: 2024
diff changeset
2 * "Real" compatible demuxer.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
3 * Copyright (c) 2000, 2001 Fabrice Bellard.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
4 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1350
diff changeset
5 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1350
diff changeset
6 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1350
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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: 1350
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1350
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
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: 1350
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 888
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20 */
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3207
diff changeset
21
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3207
diff changeset
22 #include "libavutil/avstring.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
23 #include "avformat.h"
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
24 #include "rm.h"
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
25
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
26 struct RMStream {
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
27 AVPacket pkt; ///< place to store merged video frame / reordered audio data
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
28 int videobufsize; ///< current assembled frame size
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
29 int videobufpos; ///< position for the next slice in the video buffer
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
30 int curpic_num; ///< picture number of current frame
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
31 int cur_slice, slices;
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
32 int64_t pktpos; ///< first slice position in file
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
33 /// Audio descrambling matrix parameters
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
34 int64_t audiotimestamp; ///< Audio packet timestamp
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
35 int sub_packet_cnt; // Subpacket counter, used while reading
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
36 int sub_packet_size, sub_packet_h, coded_framesize; ///< Descrambling parameters from container
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
37 int audio_framesize; /// Audio frame size from container
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
38 int sub_packet_lengths[16]; /// Length of each subpacket
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
39 };
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
40
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
41 typedef struct {
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
42 int nb_packets;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
43 int old_format;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
44 int current_stream;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
45 int remaining_len;
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
46 int audio_stream_num; ///< Stream number for audio packets
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
47 int audio_pkt_cnt; ///< Output packet counter
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
48 } RMDemuxContext;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
49
2291
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
50 static inline void get_strl(ByteIOContext *pb, char *buf, int buf_size, int len)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
51 {
2291
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
52 int i;
2290
572f7077ba40 Fix get_str/get_str8() to also work if the target string is not long enough to
diego
parents: 2274
diff changeset
53 char *q, r;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
55 q = buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56 for(i=0;i<len;i++) {
2290
572f7077ba40 Fix get_str/get_str8() to also work if the target string is not long enough to
diego
parents: 2274
diff changeset
57 r = get_byte(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58 if (i < buf_size - 1)
2290
572f7077ba40 Fix get_str/get_str8() to also work if the target string is not long enough to
diego
parents: 2274
diff changeset
59 *q++ = r;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
60 }
2290
572f7077ba40 Fix get_str/get_str8() to also work if the target string is not long enough to
diego
parents: 2274
diff changeset
61 if (buf_size > 0) *q = '\0';
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
62 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
63
2291
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
64 static void get_str16(ByteIOContext *pb, char *buf, int buf_size)
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
65 {
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
66 get_strl(pb, buf, buf_size, get_be16(pb));
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
67 }
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
68
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
69 static void get_str8(ByteIOContext *pb, char *buf, int buf_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70 {
2291
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
71 get_strl(pb, buf, buf_size, get_byte(pb));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
72 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
73
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
74 RMStream *ff_rm_alloc_rmstream (void)
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
75 {
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
76 RMStream *rms = av_mallocz(sizeof(RMStream));
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
77 rms->curpic_num = -1;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
78 return rms;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
79 }
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
80
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
81 void ff_rm_free_rmstream (RMStream *rms)
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
82 {
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
83 av_free_packet(&rms->pkt);
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
84 }
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
85
4036
1349c277efbd Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents: 4014
diff changeset
86 static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb,
4133
90a12fced519 Add RMStream object as function argument to public functions so that non-.rm
rbultje
parents: 4132
diff changeset
87 AVStream *st, RMStream *ast, int read_all)
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
88 {
886
7ed1351f8c7e Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents: 885
diff changeset
89 char buf[256];
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
90 uint32_t version;
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
91
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
92 /* ra type header */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
93 version = get_be32(pb); /* version */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
94 if (((version >> 16) & 0xff) == 3) {
886
7ed1351f8c7e Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents: 885
diff changeset
95 int64_t startpos = url_ftell(pb);
4111
eed7d267ef66 Use get_buffer() and url_fskip() for some loops of get_byte()s. See discussion in ML thread
rbultje
parents: 4110
diff changeset
96 url_fskip(pb, 14);
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
97 get_str8(pb, s->title, sizeof(s->title));
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
98 get_str8(pb, s->author, sizeof(s->author));
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
99 get_str8(pb, s->copyright, sizeof(s->copyright));
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
100 get_str8(pb, s->comment, sizeof(s->comment));
886
7ed1351f8c7e Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents: 885
diff changeset
101 if ((startpos + (version & 0xffff)) >= url_ftell(pb) + 2) {
4075
56204ba7a2c5 Fix indenting.
rbultje
parents: 4036
diff changeset
102 // fourcc (should always be "lpcJ")
56204ba7a2c5 Fix indenting.
rbultje
parents: 4036
diff changeset
103 get_byte(pb);
56204ba7a2c5 Fix indenting.
rbultje
parents: 4036
diff changeset
104 get_str8(pb, buf, sizeof(buf));
886
7ed1351f8c7e Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents: 885
diff changeset
105 }
7ed1351f8c7e Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents: 885
diff changeset
106 // Skip extra header crap (this should never happen)
7ed1351f8c7e Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents: 885
diff changeset
107 if ((startpos + (version & 0xffff)) > url_ftell(pb))
7ed1351f8c7e Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents: 885
diff changeset
108 url_fskip(pb, (version & 0xffff) + startpos - url_ftell(pb));
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
109 st->codec->sample_rate = 8000;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
110 st->codec->channels = 1;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
111 st->codec->codec_type = CODEC_TYPE_AUDIO;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
112 st->codec->codec_id = CODEC_ID_RA_144;
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
113 } else {
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
114 int flavor, sub_packet_h, coded_framesize, sub_packet_size;
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
115 /* old version (4) */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
116 get_be32(pb); /* .ra4 */
687
561f27e36bc4 ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents: 652
diff changeset
117 get_be32(pb); /* data size */
561f27e36bc4 ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents: 652
diff changeset
118 get_be16(pb); /* version2 */
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
119 get_be32(pb); /* header size */
687
561f27e36bc4 ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents: 652
diff changeset
120 flavor= get_be16(pb); /* add codec info / flavor */
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
121 ast->coded_framesize = coded_framesize = get_be32(pb); /* coded frame size */
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
122 get_be32(pb); /* ??? */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
123 get_be32(pb); /* ??? */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
124 get_be32(pb); /* ??? */
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
125 ast->sub_packet_h = sub_packet_h = get_be16(pb); /* 1 */
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
126 st->codec->block_align= get_be16(pb); /* frame size */
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
127 ast->sub_packet_size = sub_packet_size = get_be16(pb); /* sub packet size */
687
561f27e36bc4 ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents: 652
diff changeset
128 get_be16(pb); /* ??? */
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
129 if (((version >> 16) & 0xff) == 5) {
4110
9ca077eb2eb2 Reindent something that looks weird.
rbultje
parents: 4097
diff changeset
130 get_be16(pb); get_be16(pb); get_be16(pb);
9ca077eb2eb2 Reindent something that looks weird.
rbultje
parents: 4097
diff changeset
131 }
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
132 st->codec->sample_rate = get_be16(pb);
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
133 get_be32(pb);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
134 st->codec->channels = get_be16(pb);
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
135 if (((version >> 16) & 0xff) == 5) {
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
136 get_be32(pb);
4111
eed7d267ef66 Use get_buffer() and url_fskip() for some loops of get_byte()s. See discussion in ML thread
rbultje
parents: 4110
diff changeset
137 get_buffer(pb, buf, 4);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 886
diff changeset
138 buf[4] = 0;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 886
diff changeset
139 } else {
1441
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
140 get_str8(pb, buf, sizeof(buf)); /* desc */
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
141 get_str8(pb, buf, sizeof(buf)); /* desc */
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 886
diff changeset
142 }
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
143 st->codec->codec_type = CODEC_TYPE_AUDIO;
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
144 if (!strcmp(buf, "dnet")) {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
145 st->codec->codec_id = CODEC_ID_AC3;
2585
ecd8a9aa182d dnet audio needs avparser to work with the lavc ac3 decoder.
rtogni
parents: 2532
diff changeset
146 st->need_parsing = AVSTREAM_PARSE_FULL;
687
561f27e36bc4 ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents: 652
diff changeset
147 } else if (!strcmp(buf, "28_8")) {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
148 st->codec->codec_id = CODEC_ID_RA_288;
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
149 st->codec->extradata_size= 0;
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
150 ast->audio_framesize = st->codec->block_align;
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
151 st->codec->block_align = coded_framesize;
1079
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
152
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
153 if(ast->audio_framesize >= UINT_MAX / sub_packet_h){
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
154 av_log(s, AV_LOG_ERROR, "ast->audio_framesize * sub_packet_h too large\n");
1079
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
155 return -1;
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
156 }
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
157
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
158 av_new_packet(&ast->pkt, ast->audio_framesize * sub_packet_h);
3945
4928ebaaf2bd add ok parts to the rm demuxer for SIPRO support
banan
parents: 3930
diff changeset
159 } else if ((!strcmp(buf, "cook")) || (!strcmp(buf, "atrc")) || (!strcmp(buf, "sipr"))) {
4111
eed7d267ef66 Use get_buffer() and url_fskip() for some loops of get_byte()s. See discussion in ML thread
rbultje
parents: 4110
diff changeset
160 int codecdata_length;
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
161 get_be16(pb); get_byte(pb);
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
162 if (((version >> 16) & 0xff) == 5)
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
163 get_byte(pb);
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
164 codecdata_length = get_be32(pb);
1079
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
165 if(codecdata_length + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)codecdata_length){
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
166 av_log(s, AV_LOG_ERROR, "codecdata_length too large\n");
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
167 return -1;
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
168 }
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
169
4014
2e7994e45100 Check sub_packet_size against 0 to avoid div by zero later.
michael
parents: 3945
diff changeset
170 if(sub_packet_size <= 0){
2e7994e45100 Check sub_packet_size against 0 to avoid div by zero later.
michael
parents: 3945
diff changeset
171 av_log(s, AV_LOG_ERROR, "sub_packet_size is invalid\n");
2e7994e45100 Check sub_packet_size against 0 to avoid div by zero later.
michael
parents: 3945
diff changeset
172 return -1;
2e7994e45100 Check sub_packet_size against 0 to avoid div by zero later.
michael
parents: 3945
diff changeset
173 }
2e7994e45100 Check sub_packet_size against 0 to avoid div by zero later.
michael
parents: 3945
diff changeset
174
2024
8b400be65542 Atrac3 decoder.
banan
parents: 2001
diff changeset
175 if (!strcmp(buf, "cook")) st->codec->codec_id = CODEC_ID_COOK;
3945
4928ebaaf2bd add ok parts to the rm demuxer for SIPRO support
banan
parents: 3930
diff changeset
176 else if (!strcmp(buf, "sipr")) st->codec->codec_id = CODEC_ID_SIPR;
2024
8b400be65542 Atrac3 decoder.
banan
parents: 2001
diff changeset
177 else st->codec->codec_id = CODEC_ID_ATRAC3;
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
178 st->codec->extradata_size= codecdata_length;
884
2ece9c9dd94c malloc padding to avoid reading past the malloc()ed area.
henry
parents: 879
diff changeset
179 st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
4111
eed7d267ef66 Use get_buffer() and url_fskip() for some loops of get_byte()s. See discussion in ML thread
rbultje
parents: 4110
diff changeset
180 get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
181 ast->audio_framesize = st->codec->block_align;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
182 st->codec->block_align = ast->sub_packet_size;
1079
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
183
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
184 if(ast->audio_framesize >= UINT_MAX / sub_packet_h){
1079
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
185 av_log(s, AV_LOG_ERROR, "rm->audio_framesize * sub_packet_h too large\n");
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
186 return -1;
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
187 }
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
188
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
189 av_new_packet(&ast->pkt, ast->audio_framesize * sub_packet_h);
1105
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
190 } else if (!strcmp(buf, "raac") || !strcmp(buf, "racp")) {
4111
eed7d267ef66 Use get_buffer() and url_fskip() for some loops of get_byte()s. See discussion in ML thread
rbultje
parents: 4110
diff changeset
191 int codecdata_length;
1105
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
192 get_be16(pb); get_byte(pb);
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
193 if (((version >> 16) & 0xff) == 5)
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
194 get_byte(pb);
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
195 st->codec->codec_id = CODEC_ID_AAC;
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
196 codecdata_length = get_be32(pb);
1106
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
197 if(codecdata_length + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)codecdata_length){
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
198 av_log(s, AV_LOG_ERROR, "codecdata_length too large\n");
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
199 return -1;
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
200 }
1105
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
201 if (codecdata_length >= 1) {
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
202 st->codec->extradata_size = codecdata_length - 1;
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
203 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
204 get_byte(pb);
4111
eed7d267ef66 Use get_buffer() and url_fskip() for some loops of get_byte()s. See discussion in ML thread
rbultje
parents: 4110
diff changeset
205 get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
1105
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
206 }
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
207 } else {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
208 st->codec->codec_id = CODEC_ID_NONE;
2189
da71207a7cf1 use new string functions
mru
parents: 2105
diff changeset
209 av_strlcpy(st->codec->codec_name, buf, sizeof(st->codec->codec_name));
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
210 }
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
211 if (read_all) {
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
212 get_byte(pb);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
213 get_byte(pb);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
214 get_byte(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
215
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
216 get_str8(pb, s->title, sizeof(s->title));
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
217 get_str8(pb, s->author, sizeof(s->author));
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
218 get_str8(pb, s->copyright, sizeof(s->copyright));
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
219 get_str8(pb, s->comment, sizeof(s->comment));
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
220 }
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
221 }
1106
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
222 return 0;
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
223 }
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
224
2889
60275d3b2e42 Make three rm demuxer functions non static.
benoit
parents: 2883
diff changeset
225 int
4036
1349c277efbd Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents: 4014
diff changeset
226 ff_rm_read_mdpr_codecdata (AVFormatContext *s, ByteIOContext *pb,
4133
90a12fced519 Add RMStream object as function argument to public functions so that non-.rm
rbultje
parents: 4132
diff changeset
227 AVStream *st, RMStream *rst, int codec_data_size)
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
228 {
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
229 unsigned int v;
3873
9a589ae59655 Use chunk-size in function calling mdpr_read_codecdata() rather than in the
rbultje
parents: 3497
diff changeset
230 int size;
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
231 int64_t codec_pos;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
232
3874
d50c5556cb82 Move av_set_pts_info() inside the mdpr_read_codecdata() call, so that it is
rbultje
parents: 3873
diff changeset
233 av_set_pts_info(st, 64, 1, 1000);
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
234 codec_pos = url_ftell(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
235 v = get_be32(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
236 if (v == MKTAG(0xfd, 'a', 'r', '.')) {
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
237 /* ra type header */
4133
90a12fced519 Add RMStream object as function argument to public functions so that non-.rm
rbultje
parents: 4132
diff changeset
238 if (rm_read_audio_stream_info(s, pb, st, rst, 0))
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
239 return -1;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
240 } else {
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
241 int fps, fps2;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
242 if (get_le32(pb) != MKTAG('V', 'I', 'D', 'O')) {
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
243 fail1:
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
244 av_log(st->codec, AV_LOG_ERROR, "Unsupported video codec\n");
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
245 goto skip;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
246 }
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
247 st->codec->codec_tag = get_le32(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
248 // av_log(NULL, AV_LOG_DEBUG, "%X %X\n", st->codec->codec_tag, MKTAG('R', 'V', '2', '0'));
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
249 if ( st->codec->codec_tag != MKTAG('R', 'V', '1', '0')
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
250 && st->codec->codec_tag != MKTAG('R', 'V', '2', '0')
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
251 && st->codec->codec_tag != MKTAG('R', 'V', '3', '0')
3930
77b99eddf88a Add support for RVTR fourCC
vitor
parents: 3902
diff changeset
252 && st->codec->codec_tag != MKTAG('R', 'V', '4', '0')
77b99eddf88a Add support for RVTR fourCC
vitor
parents: 3902
diff changeset
253 && st->codec->codec_tag != MKTAG('R', 'V', 'T', 'R'))
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
254 goto fail1;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
255 st->codec->width = get_be16(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
256 st->codec->height = get_be16(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
257 st->codec->time_base.num= 1;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
258 fps= get_be16(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
259 st->codec->codec_type = CODEC_TYPE_VIDEO;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
260 get_be32(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
261 fps2= get_be16(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
262 get_be16(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
263
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
264 st->codec->extradata_size= codec_data_size - (url_ftell(pb) - codec_pos);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
265
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
266 if(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)st->codec->extradata_size){
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
267 //check is redundant as get_buffer() will catch this
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
268 av_log(s, AV_LOG_ERROR, "st->codec->extradata_size too large\n");
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
269 return -1;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
270 }
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
271 st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
3410
18239c59049b Check whether the memory allocation for extradata succeeded. Fixes issue 472.
takis
parents: 3286
diff changeset
272 if (!st->codec->extradata)
18239c59049b Check whether the memory allocation for extradata succeeded. Fixes issue 472.
takis
parents: 3286
diff changeset
273 return AVERROR(ENOMEM);
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
274 get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
275
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
276 // av_log(NULL, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
277 st->codec->time_base.den = fps * st->codec->time_base.num;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
278 switch(((uint8_t*)st->codec->extradata)[4]>>4){
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
279 case 1: st->codec->codec_id = CODEC_ID_RV10; break;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
280 case 2: st->codec->codec_id = CODEC_ID_RV20; break;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
281 case 3: st->codec->codec_id = CODEC_ID_RV30; break;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
282 case 4: st->codec->codec_id = CODEC_ID_RV40; break;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
283 default: goto fail1;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
284 }
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
285 }
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
286
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
287 skip:
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
288 /* skip codec info */
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
289 size = url_ftell(pb) - codec_pos;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
290 url_fskip(pb, codec_data_size - size);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
291
2719
6469205c08e4 Change ff_rm_read_mdpr_codecdata to get back to old behavior.
benoit
parents: 2707
diff changeset
292 return 0;
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
293 }
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
294
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
295
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
296 static int rm_read_header_old(AVFormatContext *s, AVFormatParameters *ap)
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
297 {
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
298 RMDemuxContext *rm = s->priv_data;
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
299 AVStream *st;
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
300
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
301 rm->old_format = 1;
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
302 st = av_new_stream(s, 0);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
303 if (!st)
1106
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
304 return -1;
4133
90a12fced519 Add RMStream object as function argument to public functions so that non-.rm
rbultje
parents: 4132
diff changeset
305 st->priv_data = ff_rm_alloc_rmstream();
90a12fced519 Add RMStream object as function argument to public functions so that non-.rm
rbultje
parents: 4132
diff changeset
306 return rm_read_audio_stream_info(s, s->pb, st, st->priv_data, 1);
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
307 }
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
308
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
309 static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
310 {
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
311 RMDemuxContext *rm = s->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
312 AVStream *st;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2770
diff changeset
313 ByteIOContext *pb = s->pb;
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
314 unsigned int tag;
3497
f9c75fed4805 Remove unused variable, fixes the warning:
diego
parents: 3486
diff changeset
315 int tag_size;
1350
f77cf5a063a8 Remove unused variables and the corresponding warnings along with them.
diego
parents: 1344
diff changeset
316 unsigned int start_time, duration;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
317 char buf[128];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
318 int flags = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
319
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
320 tag = get_le32(pb);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
321 if (tag == MKTAG('.', 'r', 'a', 0xfd)) {
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
322 /* very old .ra format */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
323 return rm_read_header_old(s, ap);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
324 } else if (tag != MKTAG('.', 'R', 'M', 'F')) {
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2237
diff changeset
325 return AVERROR(EIO);
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
326 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328 get_be32(pb); /* header size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
329 get_be16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
330 get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
331 get_be32(pb); /* number of headers */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
332
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
333 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
334 if (url_feof(pb))
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
335 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
336 tag = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
337 tag_size = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
338 get_be16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
339 #if 0
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
340 printf("tag=%c%c%c%c (%08x) size=%d\n",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
341 (tag) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
342 (tag >> 8) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
343 (tag >> 16) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344 (tag >> 24) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
345 tag,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
346 tag_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
347 #endif
736
82c34355e466 fixing broken_rv20_1mb_.rm
michael
parents: 708
diff changeset
348 if (tag_size < 10 && tag != MKTAG('D', 'A', 'T', 'A'))
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
349 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
350 switch(tag) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
351 case MKTAG('P', 'R', 'O', 'P'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
352 /* file header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
353 get_be32(pb); /* max bit rate */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
354 get_be32(pb); /* avg bit rate */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
355 get_be32(pb); /* max packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
356 get_be32(pb); /* avg packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
357 get_be32(pb); /* nb packets */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
358 get_be32(pb); /* duration */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
359 get_be32(pb); /* preroll */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
360 get_be32(pb); /* index offset */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
361 get_be32(pb); /* data offset */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
362 get_be16(pb); /* nb streams */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
363 flags = get_be16(pb); /* flags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
364 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
365 case MKTAG('C', 'O', 'N', 'T'):
2291
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
366 get_str16(pb, s->title, sizeof(s->title));
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
367 get_str16(pb, s->author, sizeof(s->author));
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
368 get_str16(pb, s->copyright, sizeof(s->copyright));
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
369 get_str16(pb, s->comment, sizeof(s->comment));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
370 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
371 case MKTAG('M', 'D', 'P', 'R'):
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 85
diff changeset
372 st = av_new_stream(s, 0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
373 if (!st)
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
374 return AVERROR(ENOMEM);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
375 st->id = get_be16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
376 get_be32(pb); /* max bit rate */
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
377 st->codec->bit_rate = get_be32(pb); /* bit rate */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
378 get_be32(pb); /* max packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
379 get_be32(pb); /* avg packet size */
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 85
diff changeset
380 start_time = get_be32(pb); /* start time */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
381 get_be32(pb); /* preroll */
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 85
diff changeset
382 duration = get_be32(pb); /* duration */
743
af4e24d6310c switch to native time bases
michael
parents: 736
diff changeset
383 st->start_time = start_time;
af4e24d6310c switch to native time bases
michael
parents: 736
diff changeset
384 st->duration = duration;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
385 get_str8(pb, buf, sizeof(buf)); /* desc */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
386 get_str8(pb, buf, sizeof(buf)); /* mimetype */
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
387 st->codec->codec_type = CODEC_TYPE_DATA;
4133
90a12fced519 Add RMStream object as function argument to public functions so that non-.rm
rbultje
parents: 4132
diff changeset
388 st->priv_data = ff_rm_alloc_rmstream();
90a12fced519 Add RMStream object as function argument to public functions so that non-.rm
rbultje
parents: 4132
diff changeset
389 if (ff_rm_read_mdpr_codecdata(s, s->pb, st, st->priv_data,
90a12fced519 Add RMStream object as function argument to public functions so that non-.rm
rbultje
parents: 4132
diff changeset
390 get_be32(pb)) < 0)
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
391 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
392 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
393 case MKTAG('D', 'A', 'T', 'A'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
394 goto header_end;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
395 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
396 /* unknown tag: skip it */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
397 url_fskip(pb, tag_size - 10);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
398 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
399 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
400 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
401 header_end:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
402 rm->nb_packets = get_be32(pb); /* number of packets */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
403 if (!rm->nb_packets && (flags & 4))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
404 rm->nb_packets = 3600 * 25;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
405 get_be32(pb); /* next data header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
406 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
407 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
408
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
409 static int get_num(ByteIOContext *pb, int *len)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
410 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
411 int n, n1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
412
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
413 n = get_be16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
414 (*len)-=2;
2791
5d0fecceff17 Revert r10892, it's wrong and no longer needed to prevent crashes
rtogni
parents: 2771
diff changeset
415 n &= 0x7FFF;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
416 if (n >= 0x4000) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
417 return n - 0x4000;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
418 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
419 n1 = get_be16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
420 (*len)-=2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
421 return (n << 16) | n1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
422 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
423 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
424
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
425 /* multiple of 20 bytes for ra144 (ugly) */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
426 #define RAW_PACKET_SIZE 1000
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
427
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
428 static int sync(AVFormatContext *s, int64_t *timestamp, int *flags, int *stream_index, int64_t *pos){
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
429 RMDemuxContext *rm = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2770
diff changeset
430 ByteIOContext *pb = s->pb;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
431 int len, num, res, i;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
432 AVStream *st;
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
433 uint32_t state=0xFFFFFFFF;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
434
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
435 while(!url_feof(pb)){
3207
8f1c183e5193 Fix seeking in rm.
michael
parents: 2940
diff changeset
436 *pos= url_ftell(pb) - 3;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
437 if(rm->remaining_len > 0){
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
438 num= rm->current_stream;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
439 len= rm->remaining_len;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
440 *timestamp = AV_NOPTS_VALUE;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
441 *flags= 0;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
442 }else{
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
443 state= (state<<8) + get_byte(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
444
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
445 if(state == MKBETAG('I', 'N', 'D', 'X')){
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
446 len = get_be16(pb) - 6;
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
447 if(len<0)
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
448 continue;
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
449 goto skip;
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
450 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
451
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
452 if(state > (unsigned)0xFFFF || state < 12)
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
453 continue;
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
454 len=state;
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
455 state= 0xFFFFFFFF;
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
456
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
457 num = get_be16(pb);
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
458 *timestamp = get_be32(pb);
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
459 res= get_byte(pb); /* reserved */
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
460 *flags = get_byte(pb); /* flags */
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
461
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
462
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
463 len -= 12;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
464 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
465 for(i=0;i<s->nb_streams;i++) {
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
466 st = s->streams[i];
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
467 if (num == st->id)
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
468 break;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
469 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
470 if (i == s->nb_streams) {
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
471 skip:
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
472 /* skip packet if unknown number */
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
473 url_fskip(pb, len);
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
474 rm->remaining_len -= len;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
475 continue;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
476 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
477 *stream_index= i;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
478
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
479 return len;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
480 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
481 return -1;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
482 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
483
4036
1349c277efbd Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents: 4014
diff changeset
484 static int rm_assemble_video_frame(AVFormatContext *s, ByteIOContext *pb,
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
485 RMDemuxContext *rm, RMStream *vst,
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
486 AVPacket *pkt, int len)
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
487 {
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
488 int hdr, seq, pic_num, len2, pos;
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
489 int type;
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
490
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
491 hdr = get_byte(pb); len--;
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
492 type = hdr >> 6;
4142
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
493
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
494 if(type != 3){ // not frame as a part of packet
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
495 seq = get_byte(pb); len--;
4142
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
496 }
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
497 if(type != 1){ // not whole frame
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
498 len2 = get_num(pb, &len);
4142
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
499 pos = get_num(pb, &len);
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
500 pic_num = get_byte(pb); len--;
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
501 }
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
502 if(len<0)
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
503 return -1;
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
504 rm->remaining_len = len;
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
505 if(type&1){ // frame, not slice
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
506 if(type == 3) // frame as a part of packet
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
507 len= len2;
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
508 if(rm->remaining_len < len)
4141
657498d1307e Add a few error checks to rm_assemble_video_frame()
michael
parents: 4140
diff changeset
509 return -1;
4142
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
510 rm->remaining_len -= len;
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
511 if(av_new_packet(pkt, len + 9) < 0)
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
512 return AVERROR(EIO);
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
513 pkt->data[0] = 0;
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
514 AV_WL32(pkt->data + 1, 1);
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
515 AV_WL32(pkt->data + 5, 0);
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
516 get_buffer(pb, pkt->data + 9, len);
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
517 return 0;
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
518 }
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
519 //now we have to deal with single slice
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
520
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
521 if((seq & 0x7F) == 1 || vst->curpic_num != pic_num){
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
522 vst->slices = ((hdr & 0x3F) << 1) + 1;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
523 vst->videobufsize = len2 + 8*vst->slices + 1;
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
524 av_free_packet(&vst->pkt); //FIXME this should be output.
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
525 if(av_new_packet(&vst->pkt, vst->videobufsize) < 0)
2763
22a672e45704 Check for memory allocation failure of temp buffer
rtogni
parents: 2762
diff changeset
526 return AVERROR(ENOMEM);
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
527 vst->videobufpos = 8*vst->slices + 1;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
528 vst->cur_slice = 0;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
529 vst->curpic_num = pic_num;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
530 vst->pktpos = url_ftell(pb);
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
531 }
2766
1d31f550e6d7 Cosmetics
rtogni
parents: 2765
diff changeset
532 if(type == 2)
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
533 len = FFMIN(len, pos);
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
534
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
535 if(++vst->cur_slice > vst->slices)
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
536 return 1;
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
537 AV_WL32(vst->pkt.data - 7 + 8*vst->cur_slice, 1);
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
538 AV_WL32(vst->pkt.data - 3 + 8*vst->cur_slice, vst->videobufpos - 8*vst->slices - 1);
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
539 if(vst->videobufpos + len > vst->videobufsize)
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
540 return 1;
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
541 if (get_buffer(pb, vst->pkt.data + vst->videobufpos, len) != len)
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
542 return AVERROR(EIO);
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
543 vst->videobufpos += len;
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
544 rm->remaining_len-= len;
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
545
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
546 if(type == 2 || (vst->videobufpos) == vst->videobufsize){
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
547 vst->pkt.data[0] = vst->cur_slice-1;
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
548 *pkt= vst->pkt;
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
549 vst->pkt.data=
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
550 vst->pkt.size= 0;
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
551 if(vst->slices != vst->cur_slice) //FIXME find out how to set slices correct from the begin
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
552 memmove(pkt->data + 1 + 8*vst->cur_slice, pkt->data + 1 + 8*vst->slices,
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
553 vst->videobufpos - 1 - 8*vst->slices);
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
554 pkt->size += 8*(vst->cur_slice - vst->slices);
2696
7671acabd99c Seek regression for RM demuxer fix
kostya
parents: 2693
diff changeset
555 pkt->pts = AV_NOPTS_VALUE;
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
556 pkt->pos = vst->pktpos;
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
557 return 0;
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
558 }
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
559
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
560 return 1;
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
561 }
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
562
2725
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
563 static inline void
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
564 rm_ac3_swap_bytes (AVStream *st, AVPacket *pkt)
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
565 {
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
566 uint8_t *ptr;
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
567 int j;
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
568
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
569 if (st->codec->codec_id == CODEC_ID_AC3) {
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
570 ptr = pkt->data;
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
571 for (j=0;j<pkt->size;j+=2) {
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
572 FFSWAP(int, ptr[0], ptr[1]);
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
573 ptr += 2;
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
574 }
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
575 }
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
576 }
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
577
2889
60275d3b2e42 Make three rm demuxer functions non static.
benoit
parents: 2883
diff changeset
578 int
4036
1349c277efbd Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents: 4014
diff changeset
579 ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb,
4133
90a12fced519 Add RMStream object as function argument to public functions so that non-.rm
rbultje
parents: 4132
diff changeset
580 AVStream *st, RMStream *ast, int len, AVPacket *pkt,
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
581 int *seq, int *flags, int64_t *timestamp)
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
582 {
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
583 RMDemuxContext *rm = s->priv_data;
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
584
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
585 if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
586 rm->current_stream= st->id;
4140
68230afdf021 All non zero returns of rm_assemble_video_frame() are errors, check things
michael
parents: 4139
diff changeset
587 if(rm_assemble_video_frame(s, pb, rm, ast, pkt, len))
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
588 return -1; //got partial frame
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
589 } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
590 if ((st->codec->codec_id == CODEC_ID_RA_288) ||
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
591 (st->codec->codec_id == CODEC_ID_COOK) ||
3945
4928ebaaf2bd add ok parts to the rm demuxer for SIPRO support
banan
parents: 3930
diff changeset
592 (st->codec->codec_id == CODEC_ID_ATRAC3) ||
4928ebaaf2bd add ok parts to the rm demuxer for SIPRO support
banan
parents: 3930
diff changeset
593 (st->codec->codec_id == CODEC_ID_SIPR)) {
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
594 int x;
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
595 int sps = ast->sub_packet_size;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
596 int cfs = ast->coded_framesize;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
597 int h = ast->sub_packet_h;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
598 int y = ast->sub_packet_cnt;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
599 int w = ast->audio_framesize;
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
600
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
601 if (*flags & 2)
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
602 y = ast->sub_packet_cnt = 0;
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
603 if (!y)
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
604 ast->audiotimestamp = *timestamp;
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
605
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
606 switch(st->codec->codec_id) {
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
607 case CODEC_ID_RA_288:
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
608 for (x = 0; x < h/2; x++)
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
609 get_buffer(pb, ast->pkt.data+x*2*w+y*cfs, cfs);
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
610 break;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
611 case CODEC_ID_ATRAC3:
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
612 case CODEC_ID_COOK:
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
613 for (x = 0; x < w/sps; x++)
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
614 get_buffer(pb, ast->pkt.data+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), sps);
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
615 break;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
616 }
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
617
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
618 if (++(ast->sub_packet_cnt) < h)
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
619 return -1;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
620 else {
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
621 ast->sub_packet_cnt = 0;
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
622 rm->audio_stream_num = st->index;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
623 rm->audio_pkt_cnt = h * w / st->codec->block_align - 1;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
624 // Release first audio packet
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
625 av_new_packet(pkt, st->codec->block_align);
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
626 memcpy(pkt->data, ast->pkt.data, st->codec->block_align); //FIXME avoid this
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
627 *timestamp = ast->audiotimestamp;
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
628 *flags = 2; // Mark first packet as keyframe
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
629 }
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
630 } else if (st->codec->codec_id == CODEC_ID_AAC) {
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
631 int x;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
632 rm->audio_stream_num = st->index;
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
633 ast->sub_packet_cnt = (get_be16(pb) & 0xf0) >> 4;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
634 if (ast->sub_packet_cnt) {
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
635 for (x = 0; x < ast->sub_packet_cnt; x++)
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
636 ast->sub_packet_lengths[x] = get_be16(pb);
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
637 // Release first audio packet
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
638 rm->audio_pkt_cnt = ast->sub_packet_cnt - 1;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
639 av_get_packet(pb, pkt, ast->sub_packet_lengths[0]);
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
640 *flags = 2; // Mark first packet as keyframe
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
641 }
2940
60b898a8e4d0 Fix forgotten braces from r11039
rtogni
parents: 2937
diff changeset
642 } else {
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
643 av_get_packet(pb, pkt, len);
2753
b55dad23bfcb Move dnet-ac3 byte-swapping code close to audio packet read code
rtogni
parents: 2725
diff changeset
644 rm_ac3_swap_bytes(st, pkt);
2940
60b898a8e4d0 Fix forgotten braces from r11039
rtogni
parents: 2937
diff changeset
645 }
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
646 } else
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
647 av_get_packet(pb, pkt, len);
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
648
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
649 if( (st->discard >= AVDISCARD_NONKEY && !(*flags&2))
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
650 || st->discard >= AVDISCARD_ALL){
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
651 av_free_packet(pkt);
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
652 return -1;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
653 }
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
654
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
655 pkt->stream_index = st->index;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
656
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
657 #if 0
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
658 if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
659 if(st->codec->codec_id == CODEC_ID_RV20){
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
660 int seq= 128*(pkt->data[2]&0x7F) + (pkt->data[3]>>1);
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
661 av_log(NULL, AV_LOG_DEBUG, "%d %"PRId64" %d\n", *timestamp, *timestamp*512LL/25, seq);
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
662
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
663 seq |= (*timestamp&~0x3FFF);
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
664 if(seq - *timestamp > 0x2000) seq -= 0x4000;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
665 if(seq - *timestamp < -0x2000) seq += 0x4000;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
666 }
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
667 }
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
668 #endif
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
669
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
670 pkt->pts= *timestamp;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
671 if (*flags & 2)
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
672 pkt->flags |= PKT_FLAG_KEY;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
673
4096
233ba738a68e Don't access RMContext directly in rdt.c. Rather, use the return value of
rbultje
parents: 4075
diff changeset
674 return st->codec->codec_type == CODEC_TYPE_AUDIO ? rm->audio_pkt_cnt : 0;
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
675 }
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
676
4135
fd0fc1e26d82 Add audio_pkt_cnt return value to ff_rm_retrieve_cache(). See discussion in
rbultje
parents: 4133
diff changeset
677 int
4036
1349c277efbd Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents: 4014
diff changeset
678 ff_rm_retrieve_cache (AVFormatContext *s, ByteIOContext *pb,
4133
90a12fced519 Add RMStream object as function argument to public functions so that non-.rm
rbultje
parents: 4132
diff changeset
679 AVStream *st, RMStream *ast, AVPacket *pkt)
2724
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
680 {
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
681 RMDemuxContext *rm = s->priv_data;
2724
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
682
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
683 assert (rm->audio_pkt_cnt > 0);
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
684
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
685 if (st->codec->codec_id == CODEC_ID_AAC)
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
686 av_get_packet(pb, pkt, ast->sub_packet_lengths[ast->sub_packet_cnt - rm->audio_pkt_cnt]);
2724
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
687 else {
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
688 av_new_packet(pkt, st->codec->block_align);
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
689 memcpy(pkt->data, ast->pkt.data + st->codec->block_align * //FIXME avoid this
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
690 (ast->sub_packet_h * ast->audio_framesize / st->codec->block_align - rm->audio_pkt_cnt),
2724
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
691 st->codec->block_align);
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
692 }
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
693 rm->audio_pkt_cnt--;
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
694 pkt->flags = 0;
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
695 pkt->stream_index = st->index;
4135
fd0fc1e26d82 Add audio_pkt_cnt return value to ff_rm_retrieve_cache(). See discussion in
rbultje
parents: 4133
diff changeset
696
fd0fc1e26d82 Add audio_pkt_cnt return value to ff_rm_retrieve_cache(). See discussion in
rbultje
parents: 4133
diff changeset
697 return rm->audio_pkt_cnt;
2724
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
698 }
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
699
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
700 static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
701 {
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
702 RMDemuxContext *rm = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2770
diff changeset
703 ByteIOContext *pb = s->pb;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
704 AVStream *st;
2725
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
705 int i, len;
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
706 int64_t timestamp, pos;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
707 int flags;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
708
888
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
709 if (rm->audio_pkt_cnt) {
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
710 // If there are queued audio packet return them first
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
711 st = s->streams[rm->audio_stream_num];
4133
90a12fced519 Add RMStream object as function argument to public functions so that non-.rm
rbultje
parents: 4132
diff changeset
712 ff_rm_retrieve_cache(s, s->pb, st, st->priv_data, pkt);
888
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
713 } else if (rm->old_format) {
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
714 RMStream *ast;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
715
888
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
716 st = s->streams[0];
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
717 ast = st->priv_data;
888
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
718 if (st->codec->codec_id == CODEC_ID_RA_288) {
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
719 int x, y;
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
720
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
721 for (y = 0; y < ast->sub_packet_h; y++)
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
722 for (x = 0; x < ast->sub_packet_h/2; x++)
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
723 if (get_buffer(pb, ast->pkt.data+x*2*ast->audio_framesize+y*ast->coded_framesize, ast->coded_framesize) <= 0)
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2237
diff changeset
724 return AVERROR(EIO);
888
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
725 rm->audio_stream_num = 0;
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
726 rm->audio_pkt_cnt = ast->sub_packet_h * ast->audio_framesize / st->codec->block_align - 1;
888
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
727 // Release first audio packet
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
728 av_new_packet(pkt, st->codec->block_align);
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
729 memcpy(pkt->data, ast->pkt.data, st->codec->block_align); //FIXME avoid this
888
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
730 pkt->flags |= PKT_FLAG_KEY; // Mark first packet as keyframe
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
731 pkt->stream_index = 0;
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
732 } else {
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
733 /* just read raw bytes */
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
734 len = RAW_PACKET_SIZE;
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
735 len= av_get_packet(pb, pkt, len);
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
736 pkt->stream_index = 0;
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
737 if (len <= 0) {
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2237
diff changeset
738 return AVERROR(EIO);
888
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
739 }
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
740 pkt->size = len;
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
741 }
2753
b55dad23bfcb Move dnet-ac3 byte-swapping code close to audio packet read code
rtogni
parents: 2725
diff changeset
742 rm_ac3_swap_bytes(st, pkt);
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
743 } else {
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
744 int seq=1;
652
b47948262721 support discarding uninterresting packets
michael
parents: 638
diff changeset
745 resync:
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
746 len=sync(s, &timestamp, &flags, &i, &pos);
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
747 if(len<0)
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2237
diff changeset
748 return AVERROR(EIO);
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
749 st = s->streams[i];
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
750
4133
90a12fced519 Add RMStream object as function argument to public functions so that non-.rm
rbultje
parents: 4132
diff changeset
751 if (ff_rm_parse_packet (s, s->pb, st, st->priv_data, len, pkt,
90a12fced519 Add RMStream object as function argument to public functions so that non-.rm
rbultje
parents: 4132
diff changeset
752 &seq, &flags, &timestamp) < 0)
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
753 goto resync;
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
754
2937
f3070076d901 Remove some spaces to keep certain people's eyes from hurting.
diego
parents: 2904
diff changeset
755 if((flags&2) && (seq&0x7F) == 1)
2883
8991b973d9f8 cosmetics: Reindent.
diego
parents: 2882
diff changeset
756 av_add_index_entry(st, pos, timestamp, 0, 0, AVINDEX_KEYFRAME);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
757 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
758
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
759 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
760 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
761
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
762 static int rm_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
763 {
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
764 int i;
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
765
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
766 for (i=0;i<s->nb_streams;i++)
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
767 ff_rm_free_rmstream(s->streams[i]->priv_data);
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
768
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
769 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
770 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
771
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
772 static int rm_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
773 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
774 /* check file header */
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
775 if ((p->buf[0] == '.' && p->buf[1] == 'R' &&
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
776 p->buf[2] == 'M' && p->buf[3] == 'F' &&
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
777 p->buf[4] == 0 && p->buf[5] == 0) ||
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
778 (p->buf[0] == '.' && p->buf[1] == 'r' &&
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
779 p->buf[2] == 'a' && p->buf[3] == 0xfd))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
780 return AVPROBE_SCORE_MAX;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
781 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
782 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
783 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
784
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
785 static int64_t rm_read_dts(AVFormatContext *s, int stream_index,
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
786 int64_t *ppos, int64_t pos_limit)
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
787 {
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
788 RMDemuxContext *rm = s->priv_data;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
789 int64_t pos, dts;
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
790 int stream_index2, flags, len, h;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
791
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
792 pos = *ppos;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
793
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
794 if(rm->old_format)
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
795 return AV_NOPTS_VALUE;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
796
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2770
diff changeset
797 url_fseek(s->pb, pos, SEEK_SET);
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
798 rm->remaining_len=0;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
799 for(;;){
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
800 int seq=1;
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
801 AVStream *st;
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
802
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
803 len=sync(s, &dts, &flags, &stream_index2, &pos);
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
804 if(len<0)
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
805 return AV_NOPTS_VALUE;
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
806
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
807 st = s->streams[stream_index2];
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
808 if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2770
diff changeset
809 h= get_byte(s->pb); len--;
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
810 if(!(h & 0x40)){
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2770
diff changeset
811 seq = get_byte(s->pb); len--;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
812 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
813 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
814
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
815 if((flags&2) && (seq&0x7F) == 1){
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
816 // av_log(s, AV_LOG_DEBUG, "%d %d-%d %"PRId64" %d\n", flags, stream_index2, stream_index, dts, seq);
979
d2e5dfdf4def add size to AVIndex
michael
parents: 896
diff changeset
817 av_add_index_entry(st, pos, dts, 0, 0, AVINDEX_KEYFRAME);
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
818 if(stream_index2 == stream_index)
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
819 break;
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
820 }
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
821
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2770
diff changeset
822 url_fskip(s->pb, len);
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
823 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
824 *ppos = pos;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
825 return dts;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
826 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
827
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
828 AVInputFormat rm_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
829 "rm",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3410
diff changeset
830 NULL_IF_CONFIG_SMALL("RM format"),
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
831 sizeof(RMDemuxContext),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
832 rm_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
833 rm_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
834 rm_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
835 rm_read_close,
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
836 NULL,
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
837 rm_read_dts,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
838 };
3902
5f9bec099c69 Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents: 3874
diff changeset
839
5f9bec099c69 Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents: 3874
diff changeset
840 AVInputFormat rdt_demuxer = {
5f9bec099c69 Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents: 3874
diff changeset
841 "rdt",
5f9bec099c69 Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents: 3874
diff changeset
842 NULL_IF_CONFIG_SMALL("RDT demuxer"),
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
843 sizeof(RMDemuxContext),
3902
5f9bec099c69 Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents: 3874
diff changeset
844 NULL, NULL, NULL, rm_read_close, NULL, NULL
5f9bec099c69 Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents: 3874
diff changeset
845 };