annotate rmdec.c @ 4924:c090f960fc8a libavformat

Per-stream language-tags extraction in asfdec. Patch by Cyril Comparon: gmail(name, surname); Original thread: Suggestion for a centralized language-tag facility in libavformat Date: 04/10/2009 07:33 PM
author benoit
date Tue, 12 May 2009 12:35:46 +0000
parents 6dcc7fc57422
children bb9cdd9ad9de
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.
4251
77e0c7511d41 cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents: 4201
diff changeset
3 * Copyright (c) 2000, 2001 Fabrice Bellard
0
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"
4201
7d2f3f1b68d8 Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
diego
parents: 4173
diff changeset
23 #include "libavutil/intreadwrite.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24 #include "avformat.h"
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
25 #include "rm.h"
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
26
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
27 struct RMStream {
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
28 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
29 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
30 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
31 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
32 int cur_slice, slices;
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
33 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
34 /// Audio descrambling matrix parameters
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
35 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
36 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
37 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
38 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
39 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
40 };
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
41
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
42 typedef struct {
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
43 int nb_packets;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
44 int old_format;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
45 int current_stream;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
46 int remaining_len;
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
47 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
48 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
49 } RMDemuxContext;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50
4755
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
51 static const unsigned char sipr_swaps[38][2] = {
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
52 { 0, 63 }, { 1, 22 }, { 2, 44 }, { 3, 90 },
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
53 { 5, 81 }, { 7, 31 }, { 8, 86 }, { 9, 58 },
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
54 { 10, 36 }, { 12, 68 }, { 13, 39 }, { 14, 73 },
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
55 { 15, 53 }, { 16, 69 }, { 17, 57 }, { 19, 88 },
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
56 { 20, 34 }, { 21, 71 }, { 24, 46 }, { 25, 94 },
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
57 { 26, 54 }, { 28, 75 }, { 29, 50 }, { 32, 70 },
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
58 { 33, 92 }, { 35, 74 }, { 38, 85 }, { 40, 56 },
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
59 { 42, 87 }, { 43, 65 }, { 45, 59 }, { 48, 79 },
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
60 { 49, 93 }, { 51, 89 }, { 55, 95 }, { 61, 76 },
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
61 { 67, 83 }, { 77, 80 }
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
62 };
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
63
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
64 static const unsigned char sipr_subpk_size[4] = { 29, 19, 37, 20 };
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
65
2291
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
66 static inline void get_strl(ByteIOContext *pb, char *buf, int buf_size, int len)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
67 {
2291
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
68 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
69 char *q, r;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
71 q = buf;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
72 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
73 r = get_byte(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
74 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
75 *q++ = r;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
76 }
2290
572f7077ba40 Fix get_str/get_str8() to also work if the target string is not long enough to
diego
parents: 2274
diff changeset
77 if (buf_size > 0) *q = '\0';
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
78 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
79
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
80 static void get_str8(ByteIOContext *pb, char *buf, int buf_size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
81 {
2291
8f90908f3c31 Merge get_str() and get_str8() functions.
diego
parents: 2290
diff changeset
82 get_strl(pb, buf, buf_size, get_byte(pb));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
83 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84
4522
aaf07b2acb3c use new metadata API in rm (de)muxer
aurel
parents: 4511
diff changeset
85 static void rm_read_metadata(AVFormatContext *s, int wide)
aaf07b2acb3c use new metadata API in rm (de)muxer
aurel
parents: 4511
diff changeset
86 {
aaf07b2acb3c use new metadata API in rm (de)muxer
aurel
parents: 4511
diff changeset
87 char buf[1024];
aaf07b2acb3c use new metadata API in rm (de)muxer
aurel
parents: 4511
diff changeset
88 int i;
aaf07b2acb3c use new metadata API in rm (de)muxer
aurel
parents: 4511
diff changeset
89 for (i=0; i<FF_ARRAY_ELEMS(ff_rm_metadata); i++) {
aaf07b2acb3c use new metadata API in rm (de)muxer
aurel
parents: 4511
diff changeset
90 int len = wide ? get_be16(s->pb) : get_byte(s->pb);
aaf07b2acb3c use new metadata API in rm (de)muxer
aurel
parents: 4511
diff changeset
91 get_strl(s->pb, buf, sizeof(buf), len);
aaf07b2acb3c use new metadata API in rm (de)muxer
aurel
parents: 4511
diff changeset
92 av_metadata_set(&s->metadata, ff_rm_metadata[i], buf);
aaf07b2acb3c use new metadata API in rm (de)muxer
aurel
parents: 4511
diff changeset
93 }
aaf07b2acb3c use new metadata API in rm (de)muxer
aurel
parents: 4511
diff changeset
94 }
aaf07b2acb3c use new metadata API in rm (de)muxer
aurel
parents: 4511
diff changeset
95
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
96 RMStream *ff_rm_alloc_rmstream (void)
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
97 {
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
98 RMStream *rms = av_mallocz(sizeof(RMStream));
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
99 rms->curpic_num = -1;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
100 return rms;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
101 }
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
102
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
103 void ff_rm_free_rmstream (RMStream *rms)
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
104 {
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
105 av_free_packet(&rms->pkt);
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
106 }
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
107
4036
1349c277efbd Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents: 4014
diff changeset
108 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
109 AVStream *st, RMStream *ast, int read_all)
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
110 {
886
7ed1351f8c7e Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents: 885
diff changeset
111 char buf[256];
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
112 uint32_t version;
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
113
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
114 /* ra type header */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
115 version = get_be32(pb); /* version */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
116 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
117 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
118 url_fskip(pb, 14);
4522
aaf07b2acb3c use new metadata API in rm (de)muxer
aurel
parents: 4511
diff changeset
119 rm_read_metadata(s, 0);
886
7ed1351f8c7e Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents: 885
diff changeset
120 if ((startpos + (version & 0xffff)) >= url_ftell(pb) + 2) {
4075
56204ba7a2c5 Fix indenting.
rbultje
parents: 4036
diff changeset
121 // fourcc (should always be "lpcJ")
56204ba7a2c5 Fix indenting.
rbultje
parents: 4036
diff changeset
122 get_byte(pb);
56204ba7a2c5 Fix indenting.
rbultje
parents: 4036
diff changeset
123 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
124 }
7ed1351f8c7e Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra
rtognimp
parents: 885
diff changeset
125 // 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
126 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
127 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
128 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
129 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
130 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
131 st->codec->codec_id = CODEC_ID_RA_144;
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
132 } else {
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
133 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
134 /* old version (4) */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
135 get_be32(pb); /* .ra4 */
687
561f27e36bc4 ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents: 652
diff changeset
136 get_be32(pb); /* data size */
561f27e36bc4 ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents: 652
diff changeset
137 get_be16(pb); /* version2 */
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
138 get_be32(pb); /* header size */
687
561f27e36bc4 ra288 demuxing support (doesnt really work, might be demuxer or decoder bug)
michael
parents: 652
diff changeset
139 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
140 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
141 get_be32(pb); /* ??? */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
142 get_be32(pb); /* ??? */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
143 get_be32(pb); /* ??? */
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
144 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
145 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
146 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
147 get_be16(pb); /* ??? */
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
148 if (((version >> 16) & 0xff) == 5) {
4110
9ca077eb2eb2 Reindent something that looks weird.
rbultje
parents: 4097
diff changeset
149 get_be16(pb); get_be16(pb); get_be16(pb);
9ca077eb2eb2 Reindent something that looks weird.
rbultje
parents: 4097
diff changeset
150 }
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
151 st->codec->sample_rate = get_be16(pb);
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
152 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
153 st->codec->channels = get_be16(pb);
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
154 if (((version >> 16) & 0xff) == 5) {
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
155 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
156 get_buffer(pb, buf, 4);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 886
diff changeset
157 buf[4] = 0;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 886
diff changeset
158 } else {
1441
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
159 get_str8(pb, buf, sizeof(buf)); /* desc */
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
160 get_str8(pb, buf, sizeof(buf)); /* desc */
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 886
diff changeset
161 }
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
162 st->codec->codec_type = CODEC_TYPE_AUDIO;
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
163 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
164 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
165 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
166 } 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
167 st->codec->codec_id = CODEC_ID_RA_288;
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
168 st->codec->extradata_size= 0;
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
169 ast->audio_framesize = st->codec->block_align;
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
170 st->codec->block_align = coded_framesize;
1079
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
171
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
172 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
173 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
174 return -1;
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
175 }
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
176
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
177 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
178 } 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
179 int codecdata_length;
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
180 get_be16(pb); get_byte(pb);
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
181 if (((version >> 16) & 0xff) == 5)
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
182 get_byte(pb);
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
183 codecdata_length = get_be32(pb);
1079
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
184 if(codecdata_length + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)codecdata_length){
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
185 av_log(s, AV_LOG_ERROR, "codecdata_length 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
2024
8b400be65542 Atrac3 decoder.
banan
parents: 2001
diff changeset
189 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
190 else if (!strcmp(buf, "sipr")) st->codec->codec_id = CODEC_ID_SIPR;
2024
8b400be65542 Atrac3 decoder.
banan
parents: 2001
diff changeset
191 else st->codec->codec_id = CODEC_ID_ATRAC3;
4755
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
192
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
193 ast->audio_framesize = st->codec->block_align;
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
194 if (st->codec->codec_id == CODEC_ID_SIPR) {
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
195 if (flavor > 3) {
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
196 av_log(s, AV_LOG_ERROR, "bad SIPR file flavor %d\n",
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
197 flavor);
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
198 return -1;
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
199 }
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
200 st->codec->block_align = sipr_subpk_size[flavor];
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
201 } else {
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
202 if(sub_packet_size <= 0){
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
203 av_log(s, AV_LOG_ERROR, "sub_packet_size is invalid\n");
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
204 return -1;
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
205 }
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
206 st->codec->block_align = ast->sub_packet_size;
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
207 }
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
208 st->codec->extradata_size= codecdata_length;
884
2ece9c9dd94c malloc padding to avoid reading past the malloc()ed area.
henry
parents: 879
diff changeset
209 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
210 get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
1079
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
211
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
212 if(ast->audio_framesize >= UINT_MAX / sub_packet_h){
1079
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
213 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
214 return -1;
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
215 }
40e81416015d sanity checks some might have been exploitable
michael
parents: 979
diff changeset
216
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
217 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
218 } 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
219 int codecdata_length;
1105
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
220 get_be16(pb); get_byte(pb);
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
221 if (((version >> 16) & 0xff) == 5)
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
222 get_byte(pb);
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
223 st->codec->codec_id = CODEC_ID_AAC;
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
224 codecdata_length = get_be32(pb);
1106
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
225 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
226 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
227 return -1;
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
228 }
1105
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
229 if (codecdata_length >= 1) {
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
230 st->codec->extradata_size = codecdata_length - 1;
d187ac890c0e Support for AAC (fourcc raac and racp) in rm files
rtogni
parents: 1079
diff changeset
231 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
232 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
233 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
234 }
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
235 } 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
236 st->codec->codec_id = CODEC_ID_NONE;
2189
da71207a7cf1 use new string functions
mru
parents: 2105
diff changeset
237 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
238 }
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
239 if (read_all) {
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
240 get_byte(pb);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
241 get_byte(pb);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
242 get_byte(pb);
4522
aaf07b2acb3c use new metadata API in rm (de)muxer
aurel
parents: 4511
diff changeset
243 rm_read_metadata(s, 0);
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
244 }
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
245 }
1106
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
246 return 0;
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
247 }
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
248
2889
60275d3b2e42 Make three rm demuxer functions non static.
benoit
parents: 2883
diff changeset
249 int
4036
1349c277efbd Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents: 4014
diff changeset
250 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
251 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
252 {
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
253 unsigned int v;
3873
9a589ae59655 Use chunk-size in function calling mdpr_read_codecdata() rather than in the
rbultje
parents: 3497
diff changeset
254 int size;
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
255 int64_t codec_pos;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
256
3874
d50c5556cb82 Move av_set_pts_info() inside the mdpr_read_codecdata() call, so that it is
rbultje
parents: 3873
diff changeset
257 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
258 codec_pos = url_ftell(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
259 v = get_be32(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
260 if (v == MKTAG(0xfd, 'a', 'r', '.')) {
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
261 /* ra type header */
4133
90a12fced519 Add RMStream object as function argument to public functions so that non-.rm
rbultje
parents: 4132
diff changeset
262 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
263 return -1;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
264 } else {
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
265 int fps, fps2;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
266 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
267 fail1:
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
268 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
269 goto skip;
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->codec_tag = get_le32(pb);
4511
e6caa2faebb3 Add a context to av_log() calls.
benoit
parents: 4465
diff changeset
272 // av_log(s, AV_LOG_DEBUG, "%X %X\n", st->codec->codec_tag, MKTAG('R', 'V', '2', '0'));
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
273 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
274 && 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
275 && st->codec->codec_tag != MKTAG('R', 'V', '3', '0')
3930
77b99eddf88a Add support for RVTR fourCC
vitor
parents: 3902
diff changeset
276 && st->codec->codec_tag != MKTAG('R', 'V', '4', '0')
77b99eddf88a Add support for RVTR fourCC
vitor
parents: 3902
diff changeset
277 && 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
278 goto fail1;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
279 st->codec->width = get_be16(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
280 st->codec->height = get_be16(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
281 st->codec->time_base.num= 1;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
282 fps= get_be16(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
283 st->codec->codec_type = CODEC_TYPE_VIDEO;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
284 get_be32(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
285 fps2= get_be16(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
286 get_be16(pb);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
287
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
288 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
289
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
290 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
291 //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
292 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
293 return -1;
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 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
296 if (!st->codec->extradata)
18239c59049b Check whether the memory allocation for extradata succeeded. Fixes issue 472.
takis
parents: 3286
diff changeset
297 return AVERROR(ENOMEM);
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
298 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
299
4511
e6caa2faebb3 Add a context to av_log() calls.
benoit
parents: 4465
diff changeset
300 // av_log(s, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2);
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
301 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
302 switch(((uint8_t*)st->codec->extradata)[4]>>4){
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
303 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
304 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
305 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
306 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
307 default: goto fail1;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
308 }
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
309 }
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
310
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
311 skip:
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
312 /* skip codec info */
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
313 size = url_ftell(pb) - codec_pos;
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
314 url_fskip(pb, codec_data_size - size);
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
315
2719
6469205c08e4 Change ff_rm_read_mdpr_codecdata to get back to old behavior.
benoit
parents: 2707
diff changeset
316 return 0;
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
317 }
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
318
4737
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
319 /** this function assumes that the demuxer has already seeked to the start
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
320 * of the INDX chunk, and will bail out if not. */
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
321 static int rm_read_index(AVFormatContext *s)
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
322 {
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
323 ByteIOContext *pb = s->pb;
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
324 unsigned int size, n_pkts, str_id, next_off, n, pos, pts;
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
325 AVStream *st;
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
326
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
327 do {
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
328 if (get_le32(pb) != MKTAG('I','N','D','X'))
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
329 return -1;
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
330 size = get_be32(pb);
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
331 if (size < 20)
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
332 return -1;
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
333 url_fskip(pb, 2);
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
334 n_pkts = get_be32(pb);
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
335 str_id = get_be16(pb);
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
336 next_off = get_be32(pb);
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
337 for (n = 0; n < s->nb_streams; n++)
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
338 if (s->streams[n]->id == str_id) {
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
339 st = s->streams[n];
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
340 break;
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
341 }
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
342 if (n == s->nb_streams)
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
343 goto skip;
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
344
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
345 for (n = 0; n < n_pkts; n++) {
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
346 url_fskip(pb, 2);
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
347 pts = get_be32(pb);
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
348 pos = get_be32(pb);
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
349 url_fskip(pb, 4); /* packet no. */
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
350
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
351 av_add_index_entry(st, pos, pts, 0, 0, AVINDEX_KEYFRAME);
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
352 }
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
353
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
354 skip:
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
355 if (next_off && url_ftell(pb) != next_off &&
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
356 url_fseek(pb, next_off, SEEK_SET) < 0)
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
357 return -1;
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
358 } while (next_off);
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
359
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
360 return 0;
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
361 }
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
362
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
363 static int rm_read_header_old(AVFormatContext *s, AVFormatParameters *ap)
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
364 {
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
365 RMDemuxContext *rm = s->priv_data;
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
366 AVStream *st;
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
367
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
368 rm->old_format = 1;
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
369 st = av_new_stream(s, 0);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
370 if (!st)
1106
8f78a071554d rm_read_audio_stream_info return type is not void
rtogni
parents: 1105
diff changeset
371 return -1;
4133
90a12fced519 Add RMStream object as function argument to public functions so that non-.rm
rbultje
parents: 4132
diff changeset
372 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
373 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
374 }
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
375
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
376 static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
377 {
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
378 RMDemuxContext *rm = s->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
379 AVStream *st;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2770
diff changeset
380 ByteIOContext *pb = s->pb;
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
381 unsigned int tag;
3497
f9c75fed4805 Remove unused variable, fixes the warning:
diego
parents: 3486
diff changeset
382 int tag_size;
1350
f77cf5a063a8 Remove unused variables and the corresponding warnings along with them.
diego
parents: 1344
diff changeset
383 unsigned int start_time, duration;
4737
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
384 unsigned int data_off = 0, indx_off = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
385 char buf[128];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
386 int flags = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
387
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
388 tag = get_le32(pb);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
389 if (tag == MKTAG('.', 'r', 'a', 0xfd)) {
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
390 /* very old .ra format */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
391 return rm_read_header_old(s, ap);
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
392 } else if (tag != MKTAG('.', 'R', 'M', 'F')) {
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2237
diff changeset
393 return AVERROR(EIO);
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
394 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
395
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
396 get_be32(pb); /* header size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
397 get_be16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
398 get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
399 get_be32(pb); /* number of headers */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
400
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
401 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
402 if (url_feof(pb))
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
403 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
404 tag = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
405 tag_size = get_be32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
406 get_be16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
407 #if 0
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
408 printf("tag=%c%c%c%c (%08x) size=%d\n",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
409 (tag) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
410 (tag >> 8) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
411 (tag >> 16) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
412 (tag >> 24) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
413 tag,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
414 tag_size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
415 #endif
736
82c34355e466 fixing broken_rv20_1mb_.rm
michael
parents: 708
diff changeset
416 if (tag_size < 10 && tag != MKTAG('D', 'A', 'T', 'A'))
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
417 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
418 switch(tag) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
419 case MKTAG('P', 'R', 'O', 'P'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
420 /* file header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
421 get_be32(pb); /* max bit rate */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
422 get_be32(pb); /* avg bit rate */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
423 get_be32(pb); /* max packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
424 get_be32(pb); /* avg packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
425 get_be32(pb); /* nb packets */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
426 get_be32(pb); /* duration */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
427 get_be32(pb); /* preroll */
4737
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
428 indx_off = get_be32(pb); /* index offset */
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
429 data_off = get_be32(pb); /* data offset */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
430 get_be16(pb); /* nb streams */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
431 flags = get_be16(pb); /* flags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
432 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
433 case MKTAG('C', 'O', 'N', 'T'):
4522
aaf07b2acb3c use new metadata API in rm (de)muxer
aurel
parents: 4511
diff changeset
434 rm_read_metadata(s, 1);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
435 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
436 case MKTAG('M', 'D', 'P', 'R'):
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 85
diff changeset
437 st = av_new_stream(s, 0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
438 if (!st)
3486
f68fcc8b8e9e factorize read_header failure freeing code
bcoudurier
parents: 3424
diff changeset
439 return AVERROR(ENOMEM);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
440 st->id = get_be16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
441 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
442 st->codec->bit_rate = get_be32(pb); /* bit rate */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
443 get_be32(pb); /* max packet size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
444 get_be32(pb); /* avg packet size */
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 85
diff changeset
445 start_time = get_be32(pb); /* start time */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
446 get_be32(pb); /* preroll */
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 85
diff changeset
447 duration = get_be32(pb); /* duration */
743
af4e24d6310c switch to native time bases
michael
parents: 736
diff changeset
448 st->start_time = start_time;
af4e24d6310c switch to native time bases
michael
parents: 736
diff changeset
449 st->duration = duration;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
450 get_str8(pb, buf, sizeof(buf)); /* desc */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
451 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
452 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
453 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
454 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
455 get_be32(pb)) < 0)
2707
0199fcbb9d23 Split out the MDPR chunk reading into its own function.
benoit
parents: 2696
diff changeset
456 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
457 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
458 case MKTAG('D', 'A', 'T', 'A'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
459 goto header_end;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
460 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
461 /* unknown tag: skip it */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
462 url_fskip(pb, tag_size - 10);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
463 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
464 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
465 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
466 header_end:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
467 rm->nb_packets = get_be32(pb); /* number of packets */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
468 if (!rm->nb_packets && (flags & 4))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
469 rm->nb_packets = 3600 * 25;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
470 get_be32(pb); /* next data header */
4737
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
471
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
472 if (!data_off)
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
473 data_off = url_ftell(pb) - 18;
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
474 if (indx_off && url_fseek(pb, indx_off, SEEK_SET) >= 0) {
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
475 rm_read_index(s);
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
476 url_fseek(pb, data_off + 18, SEEK_SET);
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
477 }
1207c596d674 Parse index chunk so that seeking in modern .rm files becomes a lot faster.
rbultje
parents: 4736
diff changeset
478
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
479 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
480 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
481
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
482 static int get_num(ByteIOContext *pb, int *len)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
483 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
484 int n, n1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
485
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
486 n = get_be16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
487 (*len)-=2;
2791
5d0fecceff17 Revert r10892, it's wrong and no longer needed to prevent crashes
rtogni
parents: 2771
diff changeset
488 n &= 0x7FFF;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
489 if (n >= 0x4000) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
490 return n - 0x4000;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
491 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
492 n1 = get_be16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
493 (*len)-=2;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
494 return (n << 16) | n1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
495 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
496 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
497
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
498 /* multiple of 20 bytes for ra144 (ugly) */
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
499 #define RAW_PACKET_SIZE 1000
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
500
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
501 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
502 RMDemuxContext *rm = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2770
diff changeset
503 ByteIOContext *pb = s->pb;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
504 AVStream *st;
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
505 uint32_t state=0xFFFFFFFF;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
506
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
507 while(!url_feof(pb)){
4885
6dcc7fc57422 Move declarations in sync() closer to where they are used.
michael
parents: 4785
diff changeset
508 int len, num, res, i;
3207
8f1c183e5193 Fix seeking in rm.
michael
parents: 2940
diff changeset
509 *pos= url_ftell(pb) - 3;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
510 if(rm->remaining_len > 0){
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
511 num= rm->current_stream;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
512 len= rm->remaining_len;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
513 *timestamp = AV_NOPTS_VALUE;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
514 *flags= 0;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
515 }else{
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
516 state= (state<<8) + get_byte(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
517
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
518 if(state == MKBETAG('I', 'N', 'D', 'X')){
4693
4de640349078 Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly
rbultje
parents: 4692
diff changeset
519 int n_pkts, expected_len;
4de640349078 Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly
rbultje
parents: 4692
diff changeset
520 len = get_be32(pb);
4de640349078 Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly
rbultje
parents: 4692
diff changeset
521 url_fskip(pb, 2);
4de640349078 Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly
rbultje
parents: 4692
diff changeset
522 n_pkts = get_be32(pb);
4de640349078 Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly
rbultje
parents: 4692
diff changeset
523 expected_len = 20 + n_pkts * 14;
4de640349078 Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly
rbultje
parents: 4692
diff changeset
524 if (len == 20)
4de640349078 Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly
rbultje
parents: 4692
diff changeset
525 /* some files don't add index entries to chunk size... */
4de640349078 Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly
rbultje
parents: 4692
diff changeset
526 len = expected_len;
4de640349078 Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly
rbultje
parents: 4692
diff changeset
527 else if (len != expected_len)
4de640349078 Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly
rbultje
parents: 4692
diff changeset
528 av_log(s, AV_LOG_WARNING,
4de640349078 Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly
rbultje
parents: 4692
diff changeset
529 "Index size %d (%d pkts) is wrong, should be %d.\n",
4de640349078 Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly
rbultje
parents: 4692
diff changeset
530 len, n_pkts, expected_len);
4de640349078 Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly
rbultje
parents: 4692
diff changeset
531 len -= 14; // we already read part of the index header
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
532 if(len<0)
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
533 continue;
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
534 goto skip;
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
535 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
536
4769
6fff7e0861fc Don't allow to sync on packets of zero-size length, since these are never
rbultje
parents: 4768
diff changeset
537 if(state > (unsigned)0xFFFF || state <= 12)
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
538 continue;
4768
667428b99cc3 Move "- 12" statement up a bit. See "[PATCH] rmdec.c: prevent zero-length
rbultje
parents: 4755
diff changeset
539 len=state - 12;
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
540 state= 0xFFFFFFFF;
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
541
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
542 num = get_be16(pb);
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
543 *timestamp = get_be32(pb);
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
544 res= get_byte(pb); /* reserved */
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
545 *flags = get_byte(pb); /* flags */
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
546 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
547 for(i=0;i<s->nb_streams;i++) {
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
548 st = s->streams[i];
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
549 if (num == st->id)
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
550 break;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
551 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
552 if (i == s->nb_streams) {
632
9f8fa2f4edfd skip INDX chunks
michael
parents: 614
diff changeset
553 skip:
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
554 /* skip packet if unknown number */
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
555 url_fskip(pb, len);
4692
71f1392ab8d4 Prevent (negative) overflow of rm->remaining_len. This evaluation really only
rbultje
parents: 4691
diff changeset
556 rm->remaining_len = 0;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
557 continue;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
558 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
559 *stream_index= i;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
560
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
561 return len;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
562 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
563 return -1;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
564 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
565
4036
1349c277efbd Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents: 4014
diff changeset
566 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
567 RMDemuxContext *rm, RMStream *vst,
4723
a2390c6a35e6 Fix index generation in the way that it was supposed to be used. See the
rbultje
parents: 4693
diff changeset
568 AVPacket *pkt, int len, int *pseq)
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
569 {
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
570 int hdr, seq, pic_num, len2, pos;
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
571 int type;
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
572
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
573 hdr = get_byte(pb); len--;
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
574 type = hdr >> 6;
4142
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
575
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
576 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
577 seq = get_byte(pb); len--;
4142
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
578 }
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
579 if(type != 1){ // not whole frame
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
580 len2 = get_num(pb, &len);
4142
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
581 pos = get_num(pb, &len);
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
582 pic_num = get_byte(pb); len--;
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
583 }
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
584 if(len<0)
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
585 return -1;
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
586 rm->remaining_len = len;
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
587 if(type&1){ // frame, not slice
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
588 if(type == 3) // frame as a part of packet
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
589 len= len2;
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
590 if(rm->remaining_len < len)
4141
657498d1307e Add a few error checks to rm_assemble_video_frame()
michael
parents: 4140
diff changeset
591 return -1;
4142
5d57b8a9e597 Simplify the top of rm_assemble_video_frame().
michael
parents: 4141
diff changeset
592 rm->remaining_len -= len;
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
593 if(av_new_packet(pkt, len + 9) < 0)
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
594 return AVERROR(EIO);
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
595 pkt->data[0] = 0;
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
596 AV_WL32(pkt->data + 1, 1);
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
597 AV_WL32(pkt->data + 5, 0);
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
598 get_buffer(pb, pkt->data + 9, len);
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
599 return 0;
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
600 }
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
601 //now we have to deal with single slice
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
602
4723
a2390c6a35e6 Fix index generation in the way that it was supposed to be used. See the
rbultje
parents: 4693
diff changeset
603 *pseq = seq;
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
604 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
605 vst->slices = ((hdr & 0x3F) << 1) + 1;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
606 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
607 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
608 if(av_new_packet(&vst->pkt, vst->videobufsize) < 0)
2763
22a672e45704 Check for memory allocation failure of temp buffer
rtogni
parents: 2762
diff changeset
609 return AVERROR(ENOMEM);
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
610 vst->videobufpos = 8*vst->slices + 1;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
611 vst->cur_slice = 0;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
612 vst->curpic_num = pic_num;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
613 vst->pktpos = url_ftell(pb);
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
614 }
2766
1d31f550e6d7 Cosmetics
rtogni
parents: 2765
diff changeset
615 if(type == 2)
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
616 len = FFMIN(len, pos);
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
617
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
618 if(++vst->cur_slice > vst->slices)
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
619 return 1;
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
620 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
621 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
622 if(vst->videobufpos + len > vst->videobufsize)
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
623 return 1;
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
624 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
625 return AVERROR(EIO);
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
626 vst->videobufpos += len;
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
627 rm->remaining_len-= len;
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
628
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
629 if(type == 2 || (vst->videobufpos) == vst->videobufsize){
4145
c1c1a6d0d529 Fix indention which was off by 1 space.
michael
parents: 4144
diff changeset
630 vst->pkt.data[0] = vst->cur_slice-1;
c1c1a6d0d529 Fix indention which was off by 1 space.
michael
parents: 4144
diff changeset
631 *pkt= vst->pkt;
4173
6088f5935138 Fix a compiler warning:
cehoyos
parents: 4146
diff changeset
632 vst->pkt.data= NULL;
4145
c1c1a6d0d529 Fix indention which was off by 1 space.
michael
parents: 4144
diff changeset
633 vst->pkt.size= 0;
c1c1a6d0d529 Fix indention which was off by 1 space.
michael
parents: 4144
diff changeset
634 if(vst->slices != vst->cur_slice) //FIXME find out how to set slices correct from the begin
4144
4970ba98ca58 Replace buffer by AVPacket and avoid a memcpy() for video when the number
michael
parents: 4143
diff changeset
635 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
636 vst->videobufpos - 1 - 8*vst->slices);
4146
af6cde9a76d1 10l set AVPacket.size to the true size of the returned data instead of
michael
parents: 4145
diff changeset
637 pkt->size = vst->videobufpos + 8*(vst->cur_slice - vst->slices);
4145
c1c1a6d0d529 Fix indention which was off by 1 space.
michael
parents: 4144
diff changeset
638 pkt->pts = AV_NOPTS_VALUE;
c1c1a6d0d529 Fix indention which was off by 1 space.
michael
parents: 4144
diff changeset
639 pkt->pos = vst->pktpos;
c1c1a6d0d529 Fix indention which was off by 1 space.
michael
parents: 4144
diff changeset
640 return 0;
2653
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
641 }
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
642
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
643 return 1;
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
644 }
67667d13bab5 Demux full frames instead of sliced for RealVideo.
kostya
parents: 2585
diff changeset
645
2725
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
646 static inline void
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
647 rm_ac3_swap_bytes (AVStream *st, AVPacket *pkt)
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
648 {
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
649 uint8_t *ptr;
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
650 int j;
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
651
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
652 if (st->codec->codec_id == CODEC_ID_AC3) {
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
653 ptr = pkt->data;
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
654 for (j=0;j<pkt->size;j+=2) {
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
655 FFSWAP(int, ptr[0], ptr[1]);
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
656 ptr += 2;
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
657 }
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
658 }
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
659 }
0fb209cef761 Split ac3 byte swapping into a separate function.
benoit
parents: 2724
diff changeset
660
4785
f9bce80b9fee Add a @todo with a comment from Kostya so we don't forget to optimize that at
rbultje
parents: 4769
diff changeset
661 /**
f9bce80b9fee Add a @todo with a comment from Kostya so we don't forget to optimize that at
rbultje
parents: 4769
diff changeset
662 * Perform 4-bit block reordering for SIPR data.
f9bce80b9fee Add a @todo with a comment from Kostya so we don't forget to optimize that at
rbultje
parents: 4769
diff changeset
663 * @todo This can be optimized, e.g. use memcpy() if data blocks are aligned
f9bce80b9fee Add a @todo with a comment from Kostya so we don't forget to optimize that at
rbultje
parents: 4769
diff changeset
664 */
4755
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
665 static void
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
666 rm_reorder_sipr_data (RMStream *ast)
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
667 {
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
668 int n, bs = ast->sub_packet_h * ast->audio_framesize * 2 / 96; // nibbles per subpacket
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
669
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
670 for (n = 0; n < 38; n++) {
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
671 int j;
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
672 int i = bs * sipr_swaps[n][0];
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
673 int o = bs * sipr_swaps[n][1];
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
674 uint8_t *buf = ast->pkt.data;
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
675
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
676 /* swap 4bit-nibbles of block 'i' with 'o' */
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
677 for (j = 0; j < bs; j++, i++, o++) {
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
678 int x = (buf[i >> 1] >> (4 * (i & 1))) & 0xF,
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
679 y = (buf[o >> 1] >> (4 * (o & 1))) & 0xF;
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
680
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
681 buf[o >> 1] = (x << (4 * (o & 1))) |
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
682 (buf[o >> 1] & (0xF << (4 * !(o & 1))));
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
683 buf[i >> 1] = (y << (4 * (i & 1))) |
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
684 (buf[i >> 1] & (0xF << (4 * !(i & 1))));
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
685 }
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
686 }
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
687 }
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
688
2889
60275d3b2e42 Make three rm demuxer functions non static.
benoit
parents: 2883
diff changeset
689 int
4036
1349c277efbd Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents: 4014
diff changeset
690 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
691 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
692 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
693 {
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
694 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
695
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
696 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
697 rm->current_stream= st->id;
4723
a2390c6a35e6 Fix index generation in the way that it was supposed to be used. See the
rbultje
parents: 4693
diff changeset
698 if(rm_assemble_video_frame(s, pb, rm, ast, pkt, len, seq))
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
699 return -1; //got partial frame
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
700 } 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
701 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
702 (st->codec->codec_id == CODEC_ID_COOK) ||
3945
4928ebaaf2bd add ok parts to the rm demuxer for SIPRO support
banan
parents: 3930
diff changeset
703 (st->codec->codec_id == CODEC_ID_ATRAC3) ||
4928ebaaf2bd add ok parts to the rm demuxer for SIPRO support
banan
parents: 3930
diff changeset
704 (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
705 int x;
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
706 int sps = ast->sub_packet_size;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
707 int cfs = ast->coded_framesize;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
708 int h = ast->sub_packet_h;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
709 int y = ast->sub_packet_cnt;
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
710 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
711
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
712 if (*flags & 2)
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
713 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
714 if (!y)
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
715 ast->audiotimestamp = *timestamp;
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
716
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
717 switch(st->codec->codec_id) {
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
718 case CODEC_ID_RA_288:
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
719 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
720 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
721 break;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
722 case CODEC_ID_ATRAC3:
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
723 case CODEC_ID_COOK:
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
724 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
725 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
726 break;
4755
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
727 case CODEC_ID_SIPR:
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
728 get_buffer(pb, ast->pkt.data + y * w, w);
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
729 break;
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
730 }
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
731
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
732 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
733 return -1;
4755
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
734 if (st->codec->codec_id == CODEC_ID_SIPR)
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
735 rm_reorder_sipr_data(ast);
e8d5fa636916 Add byte reordering for the SIPRO audio codec. See "rmdec.c: add SIPR codec
rbultje
parents: 4741
diff changeset
736
4738
08598e73b959 More reindent, forgotten in previous commit.
rbultje
parents: 4737
diff changeset
737 ast->sub_packet_cnt = 0;
08598e73b959 More reindent, forgotten in previous commit.
rbultje
parents: 4737
diff changeset
738 rm->audio_stream_num = st->index;
08598e73b959 More reindent, forgotten in previous commit.
rbultje
parents: 4737
diff changeset
739 rm->audio_pkt_cnt = h * w / st->codec->block_align;
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
740 } 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
741 int x;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
742 rm->audio_stream_num = st->index;
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
743 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
744 if (ast->sub_packet_cnt) {
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
745 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
746 ast->sub_packet_lengths[x] = get_be16(pb);
4734
dfcf66d4a613 Remove packet returning in ff_rm_parse_packet() if we're using the packet
rbultje
parents: 4733
diff changeset
747 rm->audio_pkt_cnt = ast->sub_packet_cnt;
dfcf66d4a613 Remove packet returning in ff_rm_parse_packet() if we're using the packet
rbultje
parents: 4733
diff changeset
748 ast->audiotimestamp = *timestamp;
dfcf66d4a613 Remove packet returning in ff_rm_parse_packet() if we're using the packet
rbultje
parents: 4733
diff changeset
749 } else
dfcf66d4a613 Remove packet returning in ff_rm_parse_packet() if we're using the packet
rbultje
parents: 4733
diff changeset
750 return -1;
2940
60b898a8e4d0 Fix forgotten braces from r11039
rtogni
parents: 2937
diff changeset
751 } else {
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
752 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
753 rm_ac3_swap_bytes(st, pkt);
2940
60b898a8e4d0 Fix forgotten braces from r11039
rtogni
parents: 2937
diff changeset
754 }
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
755 } else
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
756 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
757
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
758 pkt->stream_index = st->index;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
759
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
760 #if 0
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
761 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
762 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
763 int seq= 128*(pkt->data[2]&0x7F) + (pkt->data[3]>>1);
4511
e6caa2faebb3 Add a context to av_log() calls.
benoit
parents: 4465
diff changeset
764 av_log(s, AV_LOG_DEBUG, "%d %"PRId64" %d\n", *timestamp, *timestamp*512LL/25, seq);
2722
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
765
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
766 seq |= (*timestamp&~0x3FFF);
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
767 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
768 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
769 }
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
770 }
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
771 #endif
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
772
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
773 pkt->pts= *timestamp;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
774 if (*flags & 2)
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
775 pkt->flags |= PKT_FLAG_KEY;
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
776
4096
233ba738a68e Don't access RMContext directly in rdt.c. Rather, use the return value of
rbultje
parents: 4075
diff changeset
777 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
778 }
65dcef6d93e1 Split out the packet parsing from the main function body in rmdec.c
benoit
parents: 2721
diff changeset
779
4135
fd0fc1e26d82 Add audio_pkt_cnt return value to ff_rm_retrieve_cache(). See discussion in
rbultje
parents: 4133
diff changeset
780 int
4036
1349c277efbd Add ByteIOContext argument to public ff_rm_* functions so that we can
rbultje
parents: 4014
diff changeset
781 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
782 AVStream *st, RMStream *ast, AVPacket *pkt)
2724
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
783 {
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
784 RMDemuxContext *rm = s->priv_data;
2724
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
785
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
786 assert (rm->audio_pkt_cnt > 0);
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
787
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
788 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
789 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
790 else {
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
791 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
792 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
793 (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
794 st->codec->block_align);
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
795 }
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
796 rm->audio_pkt_cnt--;
4735
bf01c2a17c8d Mark the first output audio frame as keyframe (separate patch from previous,
rbultje
parents: 4734
diff changeset
797 if ((pkt->pts = ast->audiotimestamp) != AV_NOPTS_VALUE) {
bf01c2a17c8d Mark the first output audio frame as keyframe (separate patch from previous,
rbultje
parents: 4734
diff changeset
798 ast->audiotimestamp = AV_NOPTS_VALUE;
bf01c2a17c8d Mark the first output audio frame as keyframe (separate patch from previous,
rbultje
parents: 4734
diff changeset
799 pkt->flags = PKT_FLAG_KEY;
bf01c2a17c8d Mark the first output audio frame as keyframe (separate patch from previous,
rbultje
parents: 4734
diff changeset
800 } else
4736
c0e7d62efe9c Reindent after r18010.
rbultje
parents: 4735
diff changeset
801 pkt->flags = 0;
2724
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
802 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
803
fd0fc1e26d82 Add audio_pkt_cnt return value to ff_rm_retrieve_cache(). See discussion in
rbultje
parents: 4133
diff changeset
804 return rm->audio_pkt_cnt;
2724
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
805 }
1f752c3afdc8 Isolate caching of audio frames in its own function.
benoit
parents: 2723
diff changeset
806
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
807 static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
808 {
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
809 RMDemuxContext *rm = s->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
810 AVStream *st;
4732
0d7a569678a4 Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
rbultje
parents: 4723
diff changeset
811 int i, len, res, seq = 1;
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
812 int64_t timestamp, pos;
4723
a2390c6a35e6 Fix index generation in the way that it was supposed to be used. See the
rbultje
parents: 4693
diff changeset
813 int old_flags, flags;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
814
4732
0d7a569678a4 Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
rbultje
parents: 4723
diff changeset
815 for (;;) {
4733
7fbb4c4b3e3f Reindent after r18005.
rbultje
parents: 4732
diff changeset
816 if (rm->audio_pkt_cnt) {
7fbb4c4b3e3f Reindent after r18005.
rbultje
parents: 4732
diff changeset
817 // If there are queued audio packet return them first
7fbb4c4b3e3f Reindent after r18005.
rbultje
parents: 4732
diff changeset
818 st = s->streams[rm->audio_stream_num];
7fbb4c4b3e3f Reindent after r18005.
rbultje
parents: 4732
diff changeset
819 ff_rm_retrieve_cache(s, s->pb, st, st->priv_data, pkt);
4732
0d7a569678a4 Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
rbultje
parents: 4723
diff changeset
820 } else {
0d7a569678a4 Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
rbultje
parents: 4723
diff changeset
821 if (rm->old_format) {
4733
7fbb4c4b3e3f Reindent after r18005.
rbultje
parents: 4732
diff changeset
822 RMStream *ast;
4691
eb3f12a921ab Revert to r17908.
rbultje
parents: 4688
diff changeset
823
4733
7fbb4c4b3e3f Reindent after r18005.
rbultje
parents: 4732
diff changeset
824 st = s->streams[0];
7fbb4c4b3e3f Reindent after r18005.
rbultje
parents: 4732
diff changeset
825 ast = st->priv_data;
4732
0d7a569678a4 Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
rbultje
parents: 4723
diff changeset
826 timestamp = AV_NOPTS_VALUE;
0d7a569678a4 Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
rbultje
parents: 4723
diff changeset
827 len = !ast->audio_framesize ? RAW_PACKET_SIZE :
0d7a569678a4 Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
rbultje
parents: 4723
diff changeset
828 ast->coded_framesize * ast->sub_packet_h / 2;
0d7a569678a4 Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
rbultje
parents: 4723
diff changeset
829 flags = (seq++ == 1) ? 2 : 0;
4733
7fbb4c4b3e3f Reindent after r18005.
rbultje
parents: 4732
diff changeset
830 } else {
7fbb4c4b3e3f Reindent after r18005.
rbultje
parents: 4732
diff changeset
831 len=sync(s, &timestamp, &flags, &i, &pos);
4741
4f53f8346307 rmdec: fix crash at end of file
mru
parents: 4738
diff changeset
832 if (len > 0)
4f53f8346307 rmdec: fix crash at end of file
mru
parents: 4738
diff changeset
833 st = s->streams[i];
4732
0d7a569678a4 Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
rbultje
parents: 4723
diff changeset
834 }
888
78b99ab16ea2 Support for 28_8 in old ar. files
rtognimp
parents: 887
diff changeset
835
4732
0d7a569678a4 Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
rbultje
parents: 4723
diff changeset
836 if(len<0 || url_feof(s->pb))
4691
eb3f12a921ab Revert to r17908.
rbultje
parents: 4688
diff changeset
837 return AVERROR(EIO);
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
838
4733
7fbb4c4b3e3f Reindent after r18005.
rbultje
parents: 4732
diff changeset
839 old_flags = flags;
7fbb4c4b3e3f Reindent after r18005.
rbultje
parents: 4732
diff changeset
840 res = ff_rm_parse_packet (s, s->pb, st, st->priv_data, len, pkt,
7fbb4c4b3e3f Reindent after r18005.
rbultje
parents: 4732
diff changeset
841 &seq, &flags, &timestamp);
7fbb4c4b3e3f Reindent after r18005.
rbultje
parents: 4732
diff changeset
842 if((old_flags&2) && (seq&0x7F) == 1)
7fbb4c4b3e3f Reindent after r18005.
rbultje
parents: 4732
diff changeset
843 av_add_index_entry(st, pos, timestamp, 0, 0, AVINDEX_KEYFRAME);
4732
0d7a569678a4 Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
rbultje
parents: 4723
diff changeset
844 if (res)
0d7a569678a4 Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
rbultje
parents: 4723
diff changeset
845 continue;
0d7a569678a4 Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
rbultje
parents: 4723
diff changeset
846 }
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
847
4686
83eb34995cfd Move frame discarding out of the ff_rm_parse_packet() loop, and respect
rbultje
parents: 4523
diff changeset
848 if( (st->discard >= AVDISCARD_NONKEY && !(flags&2))
83eb34995cfd Move frame discarding out of the ff_rm_parse_packet() loop, and respect
rbultje
parents: 4523
diff changeset
849 || st->discard >= AVDISCARD_ALL){
83eb34995cfd Move frame discarding out of the ff_rm_parse_packet() loop, and respect
rbultje
parents: 4523
diff changeset
850 av_free_packet(pkt);
4732
0d7a569678a4 Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
rbultje
parents: 4723
diff changeset
851 } else
0d7a569678a4 Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
rbultje
parents: 4723
diff changeset
852 break;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
853 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
854
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
855 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
856 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
857
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
858 static int rm_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
859 {
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
860 int i;
879
1f093ae472d8 Cook compatibe decoder, patch by Benjamin Larsson
rtognimp
parents: 858
diff changeset
861
4132
4c732153892b Implement RMStream stream-specific private data object in the RM demuxer.
rbultje
parents: 4111
diff changeset
862 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
863 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
864
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
865 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
866 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
867
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
868 static int rm_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
869 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
870 /* check file header */
194
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
871 if ((p->buf[0] == '.' && p->buf[1] == 'R' &&
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
872 p->buf[2] == 'M' && p->buf[3] == 'F' &&
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
873 p->buf[4] == 0 && p->buf[5] == 0) ||
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
874 (p->buf[0] == '.' && p->buf[1] == 'r' &&
37e7cd3d544d support for older real audio files (<= version 3)
bellard
parents: 188
diff changeset
875 p->buf[2] == 'a' && p->buf[3] == 0xfd))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
876 return AVPROBE_SCORE_MAX;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
877 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
878 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
879 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
880
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
881 static int64_t rm_read_dts(AVFormatContext *s, int stream_index,
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
882 int64_t *ppos, int64_t pos_limit)
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
883 {
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
884 RMDemuxContext *rm = s->priv_data;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
885 int64_t pos, dts;
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
886 int stream_index2, flags, len, h;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
887
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
888 pos = *ppos;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
889
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
890 if(rm->old_format)
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
891 return AV_NOPTS_VALUE;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
892
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2770
diff changeset
893 url_fseek(s->pb, pos, SEEK_SET);
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
894 rm->remaining_len=0;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
895 for(;;){
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
896 int seq=1;
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
897 AVStream *st;
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
898
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
899 len=sync(s, &dts, &flags, &stream_index2, &pos);
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
900 if(len<0)
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
901 return AV_NOPTS_VALUE;
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
902
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
903 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
904 if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2770
diff changeset
905 h= get_byte(s->pb); len--;
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
906 if(!(h & 0x40)){
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2770
diff changeset
907 seq = get_byte(s->pb); len--;
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
908 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
909 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
910
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
911 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
912 // 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
913 av_add_index_entry(st, pos, dts, 0, 0, AVINDEX_KEYFRAME);
613
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
914 if(stream_index2 == stream_index)
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
915 break;
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
916 }
2e70d3938f50 seeking in rm 2nd try
michael
parents: 612
diff changeset
917
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2770
diff changeset
918 url_fskip(s->pb, len);
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
919 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
920 *ppos = pos;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
921 return dts;
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
922 }
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
923
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
924 AVInputFormat rm_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
925 "rm",
4465
042e9a2fdda2 Use more descriptive format long_names.
diego
parents: 4366
diff changeset
926 NULL_IF_CONFIG_SMALL("RealMedia format"),
4097
f8a743bd2df8 Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
rbultje
parents: 4096
diff changeset
927 sizeof(RMDemuxContext),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
928 rm_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
929 rm_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
930 rm_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
931 rm_read_close,
612
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
932 NULL,
fc167cb3b54c seeking in rm
michael
parents: 611
diff changeset
933 rm_read_dts,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
934 };
3902
5f9bec099c69 Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents: 3874
diff changeset
935
5f9bec099c69 Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents: 3874
diff changeset
936 AVInputFormat rdt_demuxer = {
5f9bec099c69 Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents: 3874
diff changeset
937 "rdt",
5f9bec099c69 Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents: 3874
diff changeset
938 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
939 sizeof(RMDemuxContext),
4366
287087dfcc74 Reformat rdt_demuxer AVCodec struct sanely.
michael
parents: 4251
diff changeset
940 NULL,
287087dfcc74 Reformat rdt_demuxer AVCodec struct sanely.
michael
parents: 4251
diff changeset
941 NULL,
287087dfcc74 Reformat rdt_demuxer AVCodec struct sanely.
michael
parents: 4251
diff changeset
942 NULL,
287087dfcc74 Reformat rdt_demuxer AVCodec struct sanely.
michael
parents: 4251
diff changeset
943 rm_read_close,
3902
5f9bec099c69 Add dynamic payload handlers to rdt.c. These follow the same API as the ones
rbultje
parents: 3874
diff changeset
944 };