annotate libmpdemux/demux_ty.c @ 34175:a345e7162d0a

Move TranslateFilename() to util/string.c. Now that the Win32 GUI uses symbolic constants for its messages, the code of TranslateFilename() both GUIs use is almost identical. So, share the code.
author ib
date Wed, 26 Oct 2011 15:14:06 +0000
parents 9ed8b7b1b94a
children 92dd1764392a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
1 /*
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
2 * tivo@wingert.org, February 2003
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
3 *
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
4 * Copyright (C) 2003 Christopher R. Wingert
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
5 *
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
6 * The license covers the portions of this file regarding TiVo additions.
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
7 *
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
8 * Olaf Beck and Tridge (indirectly) were essential at providing
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
9 * information regarding the format of the TiVo streams.
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
10 *
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
11 * However, no code in the following subsection is directly copied from
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
12 * either author.
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
13 *
26742
0c1db5fd3f79 Use standard license headers with standard formatting.
diego
parents: 25883
diff changeset
14 * This file is part of MPlayer.
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
15 *
26742
0c1db5fd3f79 Use standard license headers with standard formatting.
diego
parents: 25883
diff changeset
16 * MPlayer is free software; you can redistribute it and/or modify
0c1db5fd3f79 Use standard license headers with standard formatting.
diego
parents: 25883
diff changeset
17 * it under the terms of the GNU General Public License as published by
0c1db5fd3f79 Use standard license headers with standard formatting.
diego
parents: 25883
diff changeset
18 * the Free Software Foundation; either version 2 of the License, or
0c1db5fd3f79 Use standard license headers with standard formatting.
diego
parents: 25883
diff changeset
19 * (at your option) any later version.
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
20 *
26742
0c1db5fd3f79 Use standard license headers with standard formatting.
diego
parents: 25883
diff changeset
21 * MPlayer is distributed in the hope that it will be useful,
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
22 * but WITHOUT ANY WARRANTY; without even the implied warranty of
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
23 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
24 * GNU General Public License for more details.
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
25 *
26742
0c1db5fd3f79 Use standard license headers with standard formatting.
diego
parents: 25883
diff changeset
26 * You should have received a copy of the GNU General Public License along
0c1db5fd3f79 Use standard license headers with standard formatting.
diego
parents: 25883
diff changeset
27 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
0c1db5fd3f79 Use standard license headers with standard formatting.
diego
parents: 25883
diff changeset
28 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
29 */
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
30
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
31
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
32 #include <stdio.h>
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
33 #include <stdlib.h>
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
34 #include <unistd.h>
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
35 #include <time.h>
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
36 #include <stdarg.h>
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
37
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
38 #include "config.h"
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
39 #include "mp_msg.h"
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
40 #include "help_mp.h"
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
41
32345
e9556f0abee8 Replace forward declarations of skip_audio_frame() by proper #include.
diego
parents: 32012
diff changeset
42 #include "libmpcodecs/dec_audio.h"
32467
fbe5c829c69b Move libvo/sub.[ch] from libvo to sub.
cigaes
parents: 32458
diff changeset
43 #include "sub/sub.h"
22605
4d81dbdf46b9 Add explicit location for headers from the stream/ directory.
diego
parents: 20141
diff changeset
44 #include "stream/stream.h"
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
45 #include "demuxer.h"
30577
737b7fd47ef4 Add header for ty_ClearOSD(), ty_processuserdata(); avoids forward declarations.
diego
parents: 29898
diff changeset
46 #include "demux_ty_osd.h"
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
47 #include "parse_es.h"
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
48 #include "stheader.h"
32458
ab8fb38f28b1 Move sub_cc.[ch] to the sub directory.
cigaes
parents: 32345
diff changeset
49 #include "sub/sub_cc.h"
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23381
diff changeset
50 #include "libavutil/avstring.h"
24461
921de822048c Fix completely broken get_ty_pts (it's an ordinary MPEG timestamp)
reimar
parents: 24460
diff changeset
51 #include "libavutil/intreadwrite.h"
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
52
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
53 // 2/c0: audio data
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
54 // 3/c0: audio packet header (PES header)
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
55 // 4/c0: audio data (S/A only?)
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
56 // 9/c0: audio packet header, AC-3 audio
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
57 // 2/e0: video data
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
58 // 6/e0: video packet header (PES header)
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
59 // 7/e0: video sequence header start
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
60 // 8/e0: video I-frame header start
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
61 // a/e0: video P-frame header start
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
62 // b/e0: video B-frame header start
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
63 // c/e0: video GOP header start
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
64 // e/01: closed-caption data
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
65 // e/02: Extended data services data
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
66
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
67
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
68 #define TIVO_PES_FILEID 0xf5467abd
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
69 #define TIVO_PART_LENGTH 0x20000000
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
70
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
71 #define CHUNKSIZE ( 128 * 1024 )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
72 #define MAX_AUDIO_BUFFER ( 16 * 1024 )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
73
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
74 #define TY_V 1
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
75 #define TY_A 2
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
76
24499
1e57ce7abdbd Do not uselessly name structs
reimar
parents: 24498
diff changeset
77 typedef struct
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
78 {
24498
7d955b1de13c Remove another variable and reorder to avoid wasting space due to alignment
reimar
parents: 24497
diff changeset
79 off_t startOffset;
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
80 off_t fileSize;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
81 int chunks;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
82 } tmf_fileParts;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
83
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
84 #define MAX_TMF_PARTS 16
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
85
24499
1e57ce7abdbd Do not uselessly name structs
reimar
parents: 24498
diff changeset
86 typedef struct
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
87 {
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
88 int whichChunk;
29898
83425130939d Move 128kB buffer from stack to demuxer context.
reimar
parents: 28051
diff changeset
89 unsigned char chunk[ CHUNKSIZE ];
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
90
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
91 unsigned char lastAudio[ MAX_AUDIO_BUFFER ];
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
92 int lastAudioEnd;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
93
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
94 int tivoType; // 1 = SA, 2 = DTiVo
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
95
24463
f93cfdc6f4f5 Move timestamps to int64_t and use MP_NOPTS_VALUE
reimar
parents: 24462
diff changeset
96 int64_t lastAudioPTS;
f93cfdc6f4f5 Move timestamps to int64_t and use MP_NOPTS_VALUE
reimar
parents: 24462
diff changeset
97 int64_t lastVideoPTS;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
98
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
99 off_t size;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
100 int readHeader;
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
101
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
102 int tmf;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
103 tmf_fileParts tmfparts[ MAX_TMF_PARTS ];
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
104 int tmf_totalparts;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
105 } TiVoInfo;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
106
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
107 // ===========================================================================
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
108 #define TMF_SIG "showing.xml"
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
109
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
110 // ===========================================================================
24443
96dc3e753182 Make demux_ty internal functions static
reimar
parents: 24442
diff changeset
111 static int ty_tmf_filetoparts( demuxer_t *demux, TiVoInfo *tivo )
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
112 {
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
113 int parts = 0;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
114
24501
0d9578ee65cf Simpler and more robust tar parsing
reimar
parents: 24500
diff changeset
115 stream_seek(demux->stream, 0);
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
116
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
117 mp_msg( MSGT_DEMUX, MSGL_DBG3, "Dumping tar contents\n" );
24501
0d9578ee65cf Simpler and more robust tar parsing
reimar
parents: 24500
diff changeset
118 while (!demux->stream->eof)
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
119 {
24488
d6c49e8a8046 Move some more variable declarations
reimar
parents: 24487
diff changeset
120 char header[ 512 ];
d6c49e8a8046 Move some more variable declarations
reimar
parents: 24487
diff changeset
121 char *name;
24500
dcb02dadd06c Get rid of bloated ty_extension function
reimar
parents: 24499
diff changeset
122 char *extension;
24488
d6c49e8a8046 Move some more variable declarations
reimar
parents: 24487
diff changeset
123 char *sizestr;
d6c49e8a8046 Move some more variable declarations
reimar
parents: 24487
diff changeset
124 int size;
d6c49e8a8046 Move some more variable declarations
reimar
parents: 24487
diff changeset
125 off_t skip;
24457
fd8830d276ca More simplifications
reimar
parents: 24456
diff changeset
126 if (stream_read(demux->stream, header, 512) < 512)
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
127 {
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
128 mp_msg( MSGT_DEMUX, MSGL_DBG3, "Read bad\n" );
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
129 break;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
130 }
24448
044d3ec97bf7 Avoid strlcpy, tar headers already have space to ensure 0-termination
reimar
parents: 24447
diff changeset
131 name = header;
044d3ec97bf7 Avoid strlcpy, tar headers already have space to ensure 0-termination
reimar
parents: 24447
diff changeset
132 name[99] = 0;
044d3ec97bf7 Avoid strlcpy, tar headers already have space to ensure 0-termination
reimar
parents: 24447
diff changeset
133 sizestr = &header[124];
24449
1007f99949af 10l, placed terminating 0 at the wrong place.
reimar
parents: 24448
diff changeset
134 sizestr[11] = 0;
24442
9fc610537539 Use strtol instead of horribly suboptimal ty_octaltodecimal
reimar
parents: 24423
diff changeset
135 size = strtol(sizestr, NULL, 8);
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
136
24501
0d9578ee65cf Simpler and more robust tar parsing
reimar
parents: 24500
diff changeset
137 mp_msg( MSGT_DEMUX, MSGL_DBG3, "name %-20.20s size %-12.12s %d\n",
0d9578ee65cf Simpler and more robust tar parsing
reimar
parents: 24500
diff changeset
138 name, sizestr, size );
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
139
24500
dcb02dadd06c Get rid of bloated ty_extension function
reimar
parents: 24499
diff changeset
140 extension = strrchr(name, '.');
24501
0d9578ee65cf Simpler and more robust tar parsing
reimar
parents: 24500
diff changeset
141 if (extension && strcmp(extension, ".ty") == 0)
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
142 {
24455
3ae0e3067f99 Move boundary check before use!
reimar
parents: 24453
diff changeset
143 if ( parts >= MAX_TMF_PARTS ) {
3ae0e3067f99 Move boundary check before use!
reimar
parents: 24453
diff changeset
144 mp_msg( MSGT_DEMUX, MSGL_ERR, "ty:tmf too big\n" );
3ae0e3067f99 Move boundary check before use!
reimar
parents: 24453
diff changeset
145 break;
3ae0e3067f99 Move boundary check before use!
reimar
parents: 24453
diff changeset
146 }
24447
c6253f3b5f47 Do not ignore last chunk in .tmf files, it will cause part of the file to be
reimar
parents: 24446
diff changeset
147 tivo->tmfparts[ parts ].fileSize = size;
24501
0d9578ee65cf Simpler and more robust tar parsing
reimar
parents: 24500
diff changeset
148 tivo->tmfparts[ parts ].startOffset = stream_tell(demux->stream);
24450
d8b25c8a4ea4 Small simplifications
reimar
parents: 24449
diff changeset
149 tivo->tmfparts[ parts ].chunks = size / CHUNKSIZE;
24502
0266e095b2d7 Make one mp_msg call out of 3
reimar
parents: 24501
diff changeset
150 mp_msg(MSGT_DEMUX, MSGL_DBG3,
0266e095b2d7 Make one mp_msg call out of 3
reimar
parents: 24501
diff changeset
151 "tmf_filetoparts(): index %d, chunks %d\n"
0266e095b2d7 Make one mp_msg call out of 3
reimar
parents: 24501
diff changeset
152 "tmf_filetoparts(): size %"PRId64"\n"
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16346
diff changeset
153 "tmf_filetoparts(): startOffset %"PRId64"\n",
24502
0266e095b2d7 Make one mp_msg call out of 3
reimar
parents: 24501
diff changeset
154 parts, tivo->tmfparts[ parts ].chunks,
0266e095b2d7 Make one mp_msg call out of 3
reimar
parents: 24501
diff changeset
155 tivo->tmfparts[ parts ].fileSize, tivo->tmfparts[ parts ].startOffset
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
156 );
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
157 parts++;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
158 }
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
159
24501
0d9578ee65cf Simpler and more robust tar parsing
reimar
parents: 24500
diff changeset
160 // size rounded up to blocks
0d9578ee65cf Simpler and more robust tar parsing
reimar
parents: 24500
diff changeset
161 skip = (size + 511) & ~511;
0d9578ee65cf Simpler and more robust tar parsing
reimar
parents: 24500
diff changeset
162 stream_skip(demux->stream, skip);
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
163 }
24501
0d9578ee65cf Simpler and more robust tar parsing
reimar
parents: 24500
diff changeset
164 stream_reset(demux->stream);
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
165 tivo->tmf_totalparts = parts;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
166 mp_msg( MSGT_DEMUX, MSGL_DBG3,
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
167 "tmf_filetoparts(): No More Part Files %d\n", parts );
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
168
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
169 return 1;
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
170 }
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
171
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
172
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
173 // ===========================================================================
24451
abcfa91fcc9a Simplify tmf_filetooffset
reimar
parents: 24450
diff changeset
174 static off_t tmf_filetooffset(TiVoInfo *tivo, int chunk)
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
175 {
24451
abcfa91fcc9a Simplify tmf_filetooffset
reimar
parents: 24450
diff changeset
176 int i;
abcfa91fcc9a Simplify tmf_filetooffset
reimar
parents: 24450
diff changeset
177 for (i = 0; i < tivo->tmf_totalparts; i++) {
abcfa91fcc9a Simplify tmf_filetooffset
reimar
parents: 24450
diff changeset
178 if (chunk < tivo->tmfparts[i].chunks)
abcfa91fcc9a Simplify tmf_filetooffset
reimar
parents: 24450
diff changeset
179 return tivo->tmfparts[i].startOffset + chunk * CHUNKSIZE;
abcfa91fcc9a Simplify tmf_filetooffset
reimar
parents: 24450
diff changeset
180 chunk -= tivo->tmfparts[i].chunks;
abcfa91fcc9a Simplify tmf_filetooffset
reimar
parents: 24450
diff changeset
181 }
abcfa91fcc9a Simplify tmf_filetooffset
reimar
parents: 24450
diff changeset
182 return -1;
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
183 }
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
184
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
185
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
186 // ===========================================================================
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
187 static int tmf_load_chunk( demuxer_t *demux, TiVoInfo *tivo,
24506
1639f5402540 get rid of pointless size parameter for tmf_load_chunk
reimar
parents: 24505
diff changeset
188 unsigned char *buff, int readChunk )
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
189 {
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
190 off_t fileoffset;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
191 int count;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
192
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
193 mp_msg( MSGT_DEMUX, MSGL_DBG3, "\ntmf_load_chunk() begin %d\n",
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
194 readChunk );
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
195
24452
f71e3d4c2816 Simplify EOF handling
reimar
parents: 24451
diff changeset
196 fileoffset = tmf_filetooffset(tivo, readChunk);
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
197
24503
5a70ac2aea03 Simplify another two ifs into one
reimar
parents: 24502
diff changeset
198 if (fileoffset == -1 || !stream_seek(demux->stream, fileoffset)) {
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
199 mp_msg( MSGT_DEMUX, MSGL_ERR, "Read past EOF()\n" );
24464
41c96af4be72 Yet more cosmetics
reimar
parents: 24463
diff changeset
200 return 0;
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
201 }
24506
1639f5402540 get rid of pointless size parameter for tmf_load_chunk
reimar
parents: 24505
diff changeset
202 count = stream_read( demux->stream, buff, CHUNKSIZE );
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
203 demux->filepos = stream_tell( demux->stream );
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
204
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
205 mp_msg( MSGT_DEMUX, MSGL_DBG3, "tmf_load_chunk() count %x\n",
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
206 count );
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
207
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
208 mp_msg( MSGT_DEMUX, MSGL_DBG3,
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
209 "tmf_load_chunk() bytes %x %x %x %x %x %x %x %x\n",
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
210 buff[ 0 ], buff[ 1 ], buff[ 2 ], buff[ 3 ],
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
211 buff[ 4 ], buff[ 5 ], buff[ 6 ], buff[ 7 ] );
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
212
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
213 mp_msg( MSGT_DEMUX, MSGL_DBG3, "tmf_load_chunk() end\n" );
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
214
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
215 return count;
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
216 }
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
217
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
218 // ===========================================================================
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
219
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
220 // DTiVo MPEG 336, 480, 576, 768
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
221 // SA TiVo 864
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
222 // DTiVo AC-3 1550
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
223 //
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
224 #define SERIES1_PTS_LENGTH 11
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
225 #define SERIES1_PTS_OFFSET 6
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
226 #define SERIES2_PTS_LENGTH 16
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
227 #define SERIES2_PTS_OFFSET 9
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
228 #define AC3_PTS_LENGTH 16
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
229 #define AC3_PTS_OFFSET 9
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
230
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
231 static int IsValidAudioPacket( int size, int *ptsOffset, int *ptsLen )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
232 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
233 // AC-3
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
234 if ( size == 1550 || size == 1552 )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
235 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
236 *ptsOffset = AC3_PTS_OFFSET;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
237 *ptsLen = AC3_PTS_LENGTH;
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
238 return 1;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
239 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
240
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
241 // MPEG
24471
516c6a2277b1 Greatly simplify IsValidAudioPacket, though this might break something
reimar
parents: 24470
diff changeset
242 if ( (size & 15) == (SERIES1_PTS_LENGTH & 15) )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
243 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
244 *ptsOffset = SERIES1_PTS_OFFSET;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
245 *ptsLen = SERIES1_PTS_LENGTH;
24470
656a62a00e94 Simplify IsValidAudioPacket
reimar
parents: 24469
diff changeset
246 return 1;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
247 }
24471
516c6a2277b1 Greatly simplify IsValidAudioPacket, though this might break something
reimar
parents: 24470
diff changeset
248 if ( (size & 15) == (SERIES2_PTS_LENGTH & 15) )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
249 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
250 *ptsOffset = SERIES2_PTS_OFFSET;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
251 *ptsLen = SERIES2_PTS_LENGTH;
24470
656a62a00e94 Simplify IsValidAudioPacket
reimar
parents: 24469
diff changeset
252 return 1;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
253 }
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
254 mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:Tossing Audio Packet Size %d\n",
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
255 size );
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
256 return 0;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
257 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
258
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
259
24463
f93cfdc6f4f5 Move timestamps to int64_t and use MP_NOPTS_VALUE
reimar
parents: 24462
diff changeset
260 static int64_t get_ty_pts( unsigned char *buf )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
261 {
24461
921de822048c Fix completely broken get_ty_pts (it's an ordinary MPEG timestamp)
reimar
parents: 24460
diff changeset
262 int a = buf[0] & 0xe;
921de822048c Fix completely broken get_ty_pts (it's an ordinary MPEG timestamp)
reimar
parents: 24460
diff changeset
263 int b = AV_RB16(buf + 1);
921de822048c Fix completely broken get_ty_pts (it's an ordinary MPEG timestamp)
reimar
parents: 24460
diff changeset
264 int c = AV_RB16(buf + 3);
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
265
24461
921de822048c Fix completely broken get_ty_pts (it's an ordinary MPEG timestamp)
reimar
parents: 24460
diff changeset
266 if (!(1 & a & b & c)) // invalid MPEG timestamp
24463
f93cfdc6f4f5 Move timestamps to int64_t and use MP_NOPTS_VALUE
reimar
parents: 24462
diff changeset
267 return MP_NOPTS_VALUE;
24461
921de822048c Fix completely broken get_ty_pts (it's an ordinary MPEG timestamp)
reimar
parents: 24460
diff changeset
268 a >>= 1; b >>= 1; c >>= 1;
24463
f93cfdc6f4f5 Move timestamps to int64_t and use MP_NOPTS_VALUE
reimar
parents: 24462
diff changeset
269 return (((uint64_t)a) << 30) | (b << 15) | c;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
270 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
271
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
272 static void demux_ty_AddToAudioBuffer( TiVoInfo *tivo, unsigned char *buffer,
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
273 int size )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
274 {
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
275 if ( tivo->lastAudioEnd + size < MAX_AUDIO_BUFFER )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
276 {
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
277 memcpy( &tivo->lastAudio[ tivo->lastAudioEnd ],
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
278 buffer, size );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
279 tivo->lastAudioEnd += size;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
280 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
281 else
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
282 mp_msg( MSGT_DEMUX, MSGL_ERR,
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
283 "ty:WARNING - Would have blown my audio buffer\n" );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
284 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
285
24496
42693ad6dd30 Remove now useless parameters from demux_ty_CopyToDemuxPacket
reimar
parents: 24495
diff changeset
286 static void demux_ty_CopyToDemuxPacket( demux_stream_t *ds,
24497
713ad2d3878d PTS should be passed as int64_t to demux_ty_CopyToDemuxPacket
reimar
parents: 24496
diff changeset
287 unsigned char *buffer, int size, off_t pos, int64_t pts )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
288 {
24482
e5eb9ccd6679 Remove some commented-out debugging code
reimar
parents: 24481
diff changeset
289 demux_packet_t *dp = new_demux_packet( size );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
290 memcpy( dp->buffer, buffer, size );
24463
f93cfdc6f4f5 Move timestamps to int64_t and use MP_NOPTS_VALUE
reimar
parents: 24462
diff changeset
291 if (pts != MP_NOPTS_VALUE)
f93cfdc6f4f5 Move timestamps to int64_t and use MP_NOPTS_VALUE
reimar
parents: 24462
diff changeset
292 dp->pts = pts / 90000.0;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
293 dp->pos = pos;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
294 dp->flags = 0;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
295 ds_add_packet( ds, dp );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
296 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
297
24484
cf224658fbe2 Further simplify demux_ty_FindESHeader
reimar
parents: 24483
diff changeset
298 static int demux_ty_FindESHeader( uint8_t nal,
24478
43c9c72b8c54 Simplify demux_ty_FindESHeader
reimar
parents: 24477
diff changeset
299 unsigned char *buffer, int bufferSize )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
300 {
24484
cf224658fbe2 Further simplify demux_ty_FindESHeader
reimar
parents: 24483
diff changeset
301 uint32_t search = 0x00000100 | nal;
24483
e24dd407fb58 Optimize demux_ty_FindESHeader
reimar
parents: 24482
diff changeset
302 uint32_t found = -1;
e24dd407fb58 Optimize demux_ty_FindESHeader
reimar
parents: 24482
diff changeset
303 uint8_t *p = buffer;
e24dd407fb58 Optimize demux_ty_FindESHeader
reimar
parents: 24482
diff changeset
304 uint8_t *end = p + bufferSize;
e24dd407fb58 Optimize demux_ty_FindESHeader
reimar
parents: 24482
diff changeset
305 while (p < end) {
e24dd407fb58 Optimize demux_ty_FindESHeader
reimar
parents: 24482
diff changeset
306 found <<= 8;
e24dd407fb58 Optimize demux_ty_FindESHeader
reimar
parents: 24482
diff changeset
307 found |= *p++;
e24dd407fb58 Optimize demux_ty_FindESHeader
reimar
parents: 24482
diff changeset
308 if (found == search)
e24dd407fb58 Optimize demux_ty_FindESHeader
reimar
parents: 24482
diff changeset
309 return p - buffer - 4;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
310 }
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
311 return -1;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
312 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
313
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
314 static void demux_ty_FindESPacket( uint8_t nal,
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
315 unsigned char *buffer, int bufferSize, int *esOffset1, int *esOffset2 )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
316 {
24484
cf224658fbe2 Further simplify demux_ty_FindESHeader
reimar
parents: 24483
diff changeset
317 *esOffset1 = demux_ty_FindESHeader(nal, buffer, bufferSize);
24480
a365d70938b3 Simplify demux_ty_FindESPacket by reusing demux_ty_FindESHeader
reimar
parents: 24479
diff changeset
318 if (*esOffset1 == -1) {
a365d70938b3 Simplify demux_ty_FindESPacket by reusing demux_ty_FindESHeader
reimar
parents: 24479
diff changeset
319 *esOffset2 = -1;
a365d70938b3 Simplify demux_ty_FindESPacket by reusing demux_ty_FindESHeader
reimar
parents: 24479
diff changeset
320 return;
a365d70938b3 Simplify demux_ty_FindESPacket by reusing demux_ty_FindESHeader
reimar
parents: 24479
diff changeset
321 }
a365d70938b3 Simplify demux_ty_FindESPacket by reusing demux_ty_FindESHeader
reimar
parents: 24479
diff changeset
322 buffer += *esOffset1 + 1;
a365d70938b3 Simplify demux_ty_FindESPacket by reusing demux_ty_FindESHeader
reimar
parents: 24479
diff changeset
323 bufferSize -= *esOffset1 + 1;
24484
cf224658fbe2 Further simplify demux_ty_FindESHeader
reimar
parents: 24483
diff changeset
324 *esOffset2 = demux_ty_FindESHeader(nal, buffer, bufferSize);
24480
a365d70938b3 Simplify demux_ty_FindESPacket by reusing demux_ty_FindESHeader
reimar
parents: 24479
diff changeset
325 if (*esOffset2 != -1)
a365d70938b3 Simplify demux_ty_FindESPacket by reusing demux_ty_FindESHeader
reimar
parents: 24479
diff changeset
326 *esOffset2 += *esOffset1 + 1;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
327 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
328
24484
cf224658fbe2 Further simplify demux_ty_FindESHeader
reimar
parents: 24483
diff changeset
329 #define VIDEO_NAL 0xe0
cf224658fbe2 Further simplify demux_ty_FindESHeader
reimar
parents: 24483
diff changeset
330 #define AUDIO_NAL 0xc0
cf224658fbe2 Further simplify demux_ty_FindESHeader
reimar
parents: 24483
diff changeset
331 #define AC3_NAL 0xbd
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
332
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
333 static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
334 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
335 int invalidType = 0;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
336 int errorHeader = 0;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
337 int recordsDecoded = 0;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
338
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
339 int readSize;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
340
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
341 int numberRecs;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
342 unsigned char *recPtr;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
343 int offset;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
344
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
345 int counter;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
346
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
347 int aid;
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
348
24469
afbab72dbf2c Do not misuse a_streams for private info, demuxer->priv is for that!
reimar
parents: 24468
diff changeset
349 TiVoInfo *tivo = demux->priv;
29898
83425130939d Move 128kB buffer from stack to demuxer context.
reimar
parents: 28051
diff changeset
350 unsigned char *chunk = tivo->chunk;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
351
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
352 if ( demux->stream->type == STREAMTYPE_DVD )
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
353 return 0;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
354
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
355 mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:ty processing\n" );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
356
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
357 if( demux->stream->eof ) return 0;
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
358
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
359 // ======================================================================
11000
6e35326c742f many small typo and grammar fixes
gabucino
parents: 10263
diff changeset
360 // If we haven't figured out the size of the stream, let's do so
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
361 // ======================================================================
31357
0b68c2893cac Cleanup some demux_ty code and at the same time possibly fix vstream support (untested).
reimar
parents: 30577
diff changeset
362 if ( demux->stream->type == STREAMTYPE_VSTREAM )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
363 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
364 // The vstream code figures out the exact size of the stream
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
365 demux->movi_start = 0;
31357
0b68c2893cac Cleanup some demux_ty code and at the same time possibly fix vstream support (untested).
reimar
parents: 30577
diff changeset
366 demux->movi_end = demux->stream->end_pos;
0b68c2893cac Cleanup some demux_ty code and at the same time possibly fix vstream support (untested).
reimar
parents: 30577
diff changeset
367 tivo->size = demux->stream->end_pos;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
368 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
369 else
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
370 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
371 // If its a local file, try to find the Part Headers, so we can
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
372 // calculate the ACTUAL stream size
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
373 // If we can't find it, go off with the file size and hope the
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
374 // extract program did the "right thing"
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
375 if ( tivo->readHeader == 0 )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
376 {
24477
8c9d86adb28e Move variable declarations into the block where they are used
reimar
parents: 24476
diff changeset
377 off_t filePos;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
378 tivo->readHeader = 1;
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
379
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
380 filePos = demux->filepos;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
381 stream_seek( demux->stream, 0 );
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
382
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
383 readSize = stream_read( demux->stream, chunk, CHUNKSIZE );
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
384
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
385 if ( memcmp( chunk, TMF_SIG, sizeof( TMF_SIG ) ) == 0 )
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
386 {
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
387 mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:Detected a tmf\n" );
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
388 tivo->tmf = 1;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
389 ty_tmf_filetoparts( demux, tivo );
24506
1639f5402540 get rid of pointless size parameter for tmf_load_chunk
reimar
parents: 24505
diff changeset
390 readSize = tmf_load_chunk( demux, tivo, chunk, 0 );
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
391 }
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
392
24467
8231358722ed get rid of pointless pesFileId variables
reimar
parents: 24466
diff changeset
393 if ( readSize == CHUNKSIZE && AV_RB32(chunk) == TIVO_PES_FILEID )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
394 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
395 off_t numberParts;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
396
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
397 readSize = 0;
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
398
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
399 if ( tivo->tmf != 1 )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
400 {
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
401 off_t offset;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
402
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
403 numberParts = demux->stream->end_pos / TIVO_PART_LENGTH;
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
404 offset = numberParts * TIVO_PART_LENGTH;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
405
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17174
diff changeset
406 mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:ty/ty+Number Parts %"PRId64"\n",
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17174
diff changeset
407 (int64_t)numberParts );
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
408
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
409 if ( offset + CHUNKSIZE < demux->stream->end_pos )
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
410 {
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
411 stream_seek( demux->stream, offset );
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
412 readSize = stream_read( demux->stream, chunk, CHUNKSIZE );
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
413 }
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
414 }
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
415 else
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
416 {
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
417 numberParts = tivo->tmf_totalparts;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
418 offset = numberParts * TIVO_PART_LENGTH;
24506
1639f5402540 get rid of pointless size parameter for tmf_load_chunk
reimar
parents: 24505
diff changeset
419 readSize = tmf_load_chunk( demux, tivo, chunk,
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
420 numberParts * ( TIVO_PART_LENGTH - CHUNKSIZE ) /
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
421 CHUNKSIZE );
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
422 }
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
423
24467
8231358722ed get rid of pointless pesFileId variables
reimar
parents: 24466
diff changeset
424 if ( readSize == CHUNKSIZE && AV_RB32(chunk) == TIVO_PES_FILEID )
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
425 {
24477
8c9d86adb28e Move variable declarations into the block where they are used
reimar
parents: 24476
diff changeset
426 int size = AV_RB24(chunk + 12);
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
427 size -= 4;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
428 size *= CHUNKSIZE;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
429 tivo->size = numberParts * TIVO_PART_LENGTH;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
430 tivo->size += size;
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
431 mp_msg( MSGT_DEMUX, MSGL_DBG3,
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16346
diff changeset
432 "ty:Header Calc Stream Size %"PRId64"\n", tivo->size );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
433 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
434 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
435
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
436 if ( demux->stream->start_pos > 0 )
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
437 filePos = demux->stream->start_pos;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
438 stream_seek( demux->stream, filePos );
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
439 demux->filepos = stream_tell( demux->stream );
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
440 tivo->whichChunk = filePos / CHUNKSIZE;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
441 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
442 demux->movi_start = 0;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
443 demux->movi_end = tivo->size;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
444 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
445
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
446 // ======================================================================
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
447 // Give a clue as to where we are in the stream
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
448 // ======================================================================
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
449 mp_msg( MSGT_DEMUX, MSGL_DBG3,
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17174
diff changeset
450 "ty:ty header size %"PRIx64"\n", (int64_t)tivo->size );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
451 mp_msg( MSGT_DEMUX, MSGL_DBG3,
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17174
diff changeset
452 "ty:ty which Chunk %d\n", tivo->whichChunk );
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
453 mp_msg( MSGT_DEMUX, MSGL_DBG3,
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17174
diff changeset
454 "ty:file end_pos %"PRIx64"\n", (int64_t)demux->stream->end_pos );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
455 mp_msg( MSGT_DEMUX, MSGL_DBG3,
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17174
diff changeset
456 "\nty:wanted current offset %"PRIx64"\n", (int64_t)stream_tell( demux->stream ) );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
457
24464
41c96af4be72 Yet more cosmetics
reimar
parents: 24463
diff changeset
458 if ( tivo->size > 0 && stream_tell( demux->stream ) > tivo->size )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
459 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
460 demux->stream->eof = 1;
24464
41c96af4be72 Yet more cosmetics
reimar
parents: 24463
diff changeset
461 return 0;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
462 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
463
24507
e28f9913f48a Avoid one more code duplication
reimar
parents: 24506
diff changeset
464 do {
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
465 if ( tivo->tmf != 1 )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
466 {
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
467 // Make sure we are on a 128k boundary
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
468 if ( demux->filepos % CHUNKSIZE != 0 )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
469 {
24477
8c9d86adb28e Move variable declarations into the block where they are used
reimar
parents: 24476
diff changeset
470 int whichChunk = demux->filepos / CHUNKSIZE;
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
471 if ( demux->filepos % CHUNKSIZE > CHUNKSIZE / 2 )
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
472 whichChunk++;
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
473 stream_seek( demux->stream, whichChunk * CHUNKSIZE );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
474 }
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
475
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
476 demux->filepos = stream_tell( demux->stream );
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
477 tivo->whichChunk = demux->filepos / CHUNKSIZE;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
478 readSize = stream_read( demux->stream, chunk, CHUNKSIZE );
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
479 if ( readSize != CHUNKSIZE )
24464
41c96af4be72 Yet more cosmetics
reimar
parents: 24463
diff changeset
480 return 0;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
481 }
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
482 else
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
483 {
24506
1639f5402540 get rid of pointless size parameter for tmf_load_chunk
reimar
parents: 24505
diff changeset
484 readSize = tmf_load_chunk( demux, tivo, chunk, tivo->whichChunk );
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
485 if ( readSize != CHUNKSIZE )
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
486 return 0;
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
487 tivo->whichChunk++;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
488 }
24507
e28f9913f48a Avoid one more code duplication
reimar
parents: 24506
diff changeset
489 if (AV_RB32(chunk) == TIVO_PES_FILEID)
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
490 mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:Skipping PART Header\n" );
24507
e28f9913f48a Avoid one more code duplication
reimar
parents: 24506
diff changeset
491 } while (AV_RB32(chunk) == TIVO_PES_FILEID);
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
492
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
493 mp_msg( MSGT_DEMUX, MSGL_DBG3,
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
494 "\nty:actual current offset %"PRIx64"\n", stream_tell( demux->stream ) -
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
495 CHUNKSIZE );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
496
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
497
12860
03d3ab9f6400 embarassing typo
diego
parents: 11000
diff changeset
498 // Let's make a Video Demux Stream for MPlayer
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
499 aid = 0x0;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
500 if( !demux->v_streams[ aid ] ) new_sh_video( demux, aid );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
501 if( demux->video->id == -1 ) demux->video->id = aid;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
502 if( demux->video->id == aid )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
503 {
24477
8c9d86adb28e Move variable declarations into the block where they are used
reimar
parents: 24476
diff changeset
504 demux_stream_t *ds = demux->video;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
505 if( !ds->sh ) ds->sh = demux->v_streams[ aid ];
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
506 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
507
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
508 // ======================================================================
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
509 // Finally, we get to actually parse the chunk
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
510 // ======================================================================
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
511 mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:ty parsing a chunk\n" );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
512 numberRecs = chunk[ 0 ];
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
513 recPtr = &chunk[ 4 ];
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
514 offset = numberRecs * 16 + 4;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
515 for ( counter = 0 ; counter < numberRecs ; counter++ )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
516 {
24477
8c9d86adb28e Move variable declarations into the block where they are used
reimar
parents: 24476
diff changeset
517 int size = AV_RB24(recPtr) >> 4;
8c9d86adb28e Move variable declarations into the block where they are used
reimar
parents: 24476
diff changeset
518 int type = recPtr[ 3 ];
8c9d86adb28e Move variable declarations into the block where they are used
reimar
parents: 24476
diff changeset
519 int nybbleType = recPtr[ 2 ] & 0x0f;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
520 recordsDecoded++;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
521
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
522 mp_msg( MSGT_DEMUX, MSGL_DBG3,
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
523 "ty:Record Type %x/%x %d\n", nybbleType, type, size );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
524
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
525 // ================================================================
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
526 // Video Parsing
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
527 // ================================================================
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
528 if ( type == 0xe0 )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
529 {
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
530 if ( size > 0 && size + offset <= CHUNKSIZE )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
531 {
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
532 int esOffset1 = demux_ty_FindESHeader( VIDEO_NAL, &chunk[ offset ],
24478
43c9c72b8c54 Simplify demux_ty_FindESHeader
reimar
parents: 24477
diff changeset
533 size);
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
534 if ( esOffset1 != -1 )
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
535 tivo->lastVideoPTS = get_ty_pts(
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
536 &chunk[ offset + esOffset1 + 9 ] );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
537
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
538 // Do NOT Pass the PES Header onto the MPEG2 Decode
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
539 if( nybbleType != 0x06 )
24496
42693ad6dd30 Remove now useless parameters from demux_ty_CopyToDemuxPacket
reimar
parents: 24495
diff changeset
540 demux_ty_CopyToDemuxPacket( demux->video,
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
541 &chunk[ offset ], size, demux->filepos + offset,
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
542 tivo->lastVideoPTS );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
543 offset += size;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
544 }
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
545 else
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
546 errorHeader++;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
547 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
548 // ================================================================
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
549 // Audio Parsing
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
550 // ================================================================
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
551 else if ( type == 0xc0 )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
552 {
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
553 if ( size > 0 && size + offset <= CHUNKSIZE )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
554 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
555 if( demux->audio->id == -1 )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
556 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
557 if ( nybbleType == 0x02 )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
558 continue; // DTiVo inconclusive, wait for more
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
559 else if ( nybbleType == 0x09 )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
560 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
561 mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:Setting AC-3 Audio\n" );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
562 aid = 0x80; // AC-3
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
563 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
564 else
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
565 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
566 mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:Setting MPEG Audio\n" );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
567 aid = 0x0; // MPEG Audio
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
568 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
569
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
570 demux->audio->id = aid;
31609
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 31357
diff changeset
571 if( !demux->a_streams[ aid ] ) new_sh_audio( demux, aid, NULL );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
572 if( demux->audio->id == aid )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
573 {
24477
8c9d86adb28e Move variable declarations into the block where they are used
reimar
parents: 24476
diff changeset
574 demux_stream_t *ds = demux->audio;
15580
fa5573007038 fix audio init crash
joey
parents: 14502
diff changeset
575 if( !ds->sh ) {
fa5573007038 fix audio init crash
joey
parents: 14502
diff changeset
576 sh_audio_t* sh_a;
fa5573007038 fix audio init crash
joey
parents: 14502
diff changeset
577 ds->sh = demux->a_streams[ aid ];
fa5573007038 fix audio init crash
joey
parents: 14502
diff changeset
578 sh_a = (sh_audio_t*)ds->sh;
fa5573007038 fix audio init crash
joey
parents: 14502
diff changeset
579 switch(aid & 0xE0){ // 1110 0000 b (high 3 bit: type low 5: id)
fa5573007038 fix audio init crash
joey
parents: 14502
diff changeset
580 case 0x00: sh_a->format=0x50;break; // mpeg
fa5573007038 fix audio init crash
joey
parents: 14502
diff changeset
581 case 0xA0: sh_a->format=0x10001;break; // dvd pcm
fa5573007038 fix audio init crash
joey
parents: 14502
diff changeset
582 case 0x80: if((aid & 0xF8) == 0x88) sh_a->format=0x2001;//dts
fa5573007038 fix audio init crash
joey
parents: 14502
diff changeset
583 else sh_a->format=0x2000;break; // ac3
fa5573007038 fix audio init crash
joey
parents: 14502
diff changeset
584 }
fa5573007038 fix audio init crash
joey
parents: 14502
diff changeset
585 }
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
586 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
587 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
588
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
589 aid = demux->audio->id;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
590
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
591
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
592 // SA DTiVo Audio Data, no PES
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
593 // ================================================
24476
b42dd327f81f Another piece of duplicate code
reimar
parents: 24475
diff changeset
594 if ( nybbleType == 0x02 || nybbleType == 0x04 )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
595 {
24476
b42dd327f81f Another piece of duplicate code
reimar
parents: 24475
diff changeset
596 if ( nybbleType == 0x02 && tivo->tivoType == 2 )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
597 demux_ty_AddToAudioBuffer( tivo, &chunk[ offset ], size );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
598 else
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
599 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
600
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
601 mp_msg( MSGT_DEMUX, MSGL_DBG3,
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
602 "ty:Adding Audio Packet Size %d\n", size );
24496
42693ad6dd30 Remove now useless parameters from demux_ty_CopyToDemuxPacket
reimar
parents: 24495
diff changeset
603 demux_ty_CopyToDemuxPacket( demux->audio,
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
604 &chunk[ offset ], size, ( demux->filepos + offset ),
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
605 tivo->lastAudioPTS );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
606 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
607 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
608
24475
7e10a426b257 Avoid a big piece of duplicated code
reimar
parents: 24474
diff changeset
609 // 3 - MPEG Audio with PES Header, either SA or DTiVo
7e10a426b257 Avoid a big piece of duplicated code
reimar
parents: 24474
diff changeset
610 // 9 - DTiVo AC3 Audio Data with PES Header
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
611 // ================================================
24475
7e10a426b257 Avoid a big piece of duplicated code
reimar
parents: 24474
diff changeset
612 if ( nybbleType == 0x03 || nybbleType == 0x09 )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
613 {
24477
8c9d86adb28e Move variable declarations into the block where they are used
reimar
parents: 24476
diff changeset
614 int esOffset1, esOffset2;
24475
7e10a426b257 Avoid a big piece of duplicated code
reimar
parents: 24474
diff changeset
615 if ( nybbleType == 0x03 )
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
616 esOffset1 = demux_ty_FindESHeader( AUDIO_NAL, &chunk[ offset ],
24478
43c9c72b8c54 Simplify demux_ty_FindESHeader
reimar
parents: 24477
diff changeset
617 size);
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
618
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
619 // SA PES Header, No Audio Data
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
620 // ================================================
24475
7e10a426b257 Avoid a big piece of duplicated code
reimar
parents: 24474
diff changeset
621 if ( nybbleType == 0x03 && esOffset1 == 0 && size == 16 )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
622 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
623 tivo->tivoType = 1;
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
624 tivo->lastAudioPTS = get_ty_pts( &chunk[ offset +
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
625 SERIES2_PTS_OFFSET ] );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
626 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
627 else
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
628 // DTiVo Audio with PES Header
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
629 // ================================================
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
630 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
631 tivo->tivoType = 2;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
632
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
633 demux_ty_AddToAudioBuffer( tivo, &chunk[ offset ], size );
24484
cf224658fbe2 Further simplify demux_ty_FindESHeader
reimar
parents: 24483
diff changeset
634 demux_ty_FindESPacket( nybbleType == 9 ? AC3_NAL : AUDIO_NAL,
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
635 tivo->lastAudio, tivo->lastAudioEnd, &esOffset1,
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
636 &esOffset2 );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
637
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
638 if ( esOffset1 != -1 && esOffset2 != -1 )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
639 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
640 int packetSize = esOffset2 - esOffset1;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
641 int headerSize;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
642 int ptsOffset;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
643
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
644 if ( IsValidAudioPacket( packetSize, &ptsOffset,
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
645 &headerSize ) )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
646 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
647 mp_msg( MSGT_DEMUX, MSGL_DBG3,
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
648 "ty:Adding DTiVo Audio Packet Size %d\n",
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
649 packetSize );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
650
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
651 tivo->lastAudioPTS = get_ty_pts(
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
652 &tivo->lastAudio[ esOffset1 + ptsOffset ] );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
653
24475
7e10a426b257 Avoid a big piece of duplicated code
reimar
parents: 24474
diff changeset
654 if (nybbleType == 9) headerSize = 0;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
655 demux_ty_CopyToDemuxPacket
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
656 (
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
657 demux->audio,
24486
20a8ee3f041a A few more useless ()
reimar
parents: 24485
diff changeset
658 &tivo->lastAudio[ esOffset1 + headerSize ],
20a8ee3f041a A few more useless ()
reimar
parents: 24485
diff changeset
659 packetSize - headerSize,
20a8ee3f041a A few more useless ()
reimar
parents: 24485
diff changeset
660 demux->filepos + offset,
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
661 tivo->lastAudioPTS
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
662 );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
663
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
664 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
665
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
666 // Collapse the Audio Buffer
24485
cb919d4b54e8 Minor simplifications
reimar
parents: 24484
diff changeset
667 tivo->lastAudioEnd -= esOffset2;
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
668 memmove( &tivo->lastAudio[ 0 ],
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
669 &tivo->lastAudio[ esOffset2 ],
24485
cb919d4b54e8 Minor simplifications
reimar
parents: 24484
diff changeset
670 tivo->lastAudioEnd );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
671 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
672 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
673 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
674
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
675 offset += size;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
676 }
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
677 else
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
678 errorHeader++;
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
679 }
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
680 // ================================================================
24474
1754f9ab919e Get rid of more code duplication
reimar
parents: 24473
diff changeset
681 // 1 = Closed Caption
1754f9ab919e Get rid of more code duplication
reimar
parents: 24473
diff changeset
682 // 2 = Extended Data Services
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
683 // ================================================================
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
684 else if ( type == 0x01 || type == 0x02 )
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
685 {
24474
1754f9ab919e Get rid of more code duplication
reimar
parents: 24473
diff changeset
686 unsigned char lastXDS[ 16 ];
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
687 int b = AV_RB24(recPtr) >> 4;
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
688 b &= 0x7f7f;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
689
24474
1754f9ab919e Get rid of more code duplication
reimar
parents: 24473
diff changeset
690 mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:%s %04x\n", type == 1 ? "CC" : "XDS", b);
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
691
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
692 lastXDS[ 0x00 ] = 0x00;
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
693 lastXDS[ 0x01 ] = 0x00;
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
694 lastXDS[ 0x02 ] = 0x01;
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
695 lastXDS[ 0x03 ] = 0xb2;
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
696 lastXDS[ 0x04 ] = 'T';
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
697 lastXDS[ 0x05 ] = 'Y';
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
698 lastXDS[ 0x06 ] = type;
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
699 lastXDS[ 0x07 ] = b >> 8;
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
700 lastXDS[ 0x08 ] = b;
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
701 if ( subcc_enabled )
24496
42693ad6dd30 Remove now useless parameters from demux_ty_CopyToDemuxPacket
reimar
parents: 24495
diff changeset
702 demux_ty_CopyToDemuxPacket( demux->video, lastXDS, 0x09,
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
703 demux->filepos + offset, tivo->lastVideoPTS );
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
704 }
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
705 // ================================================================
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
706 // Unknown
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
707 // ================================================================
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
708 else
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
709 {
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
710 if ( size > 0 && size + offset <= CHUNKSIZE )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
711 offset += size;
24489
97eba82233f5 live recordings can contain 0-size type 0 chunks, ignore them instead
reimar
parents: 24488
diff changeset
712 if (type != 3 && type != 5 && (type != 0 || size > 0)) {
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
713 mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:Invalid Type %x\n", type );
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
714 invalidType++;
24472
9341d242f432 Reduce code duplication
reimar
parents: 24471
diff changeset
715 }
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
716 }
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
717 recPtr += 16;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
718 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
719
20141
bd3afd5a2e48 Fix misdetection of http://samples.mplayerhq.hu/tta/tivo_misdetect.tta as TiVo file
reimar
parents: 19614
diff changeset
720 if ( errorHeader > 0 || invalidType > 0 )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
721 {
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
722 mp_msg( MSGT_DEMUX, MSGL_DBG3,
20141
bd3afd5a2e48 Fix misdetection of http://samples.mplayerhq.hu/tta/tivo_misdetect.tta as TiVo file
reimar
parents: 19614
diff changeset
723 "ty:Error Check - Records %d, Parsed %d, Errors %d + %d\n",
bd3afd5a2e48 Fix misdetection of http://samples.mplayerhq.hu/tta/tivo_misdetect.tta as TiVo file
reimar
parents: 19614
diff changeset
724 numberRecs, recordsDecoded, errorHeader, invalidType );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
725
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
726 // Invalid MPEG ES Size Check
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
727 if ( errorHeader > numberRecs / 2 )
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
728 return 0;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
729
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
730 // Invalid MPEG Stream Type Check
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
731 if ( invalidType > numberRecs / 2 )
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
732 return 0;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
733 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
734
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
735 demux->filepos = stream_tell( demux->stream );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
736
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
737 return 1;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
738 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
739
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
740 static void demux_seek_ty( demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
741 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
742 demux_stream_t *d_audio = demuxer->audio;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
743 demux_stream_t *d_video = demuxer->video;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
744 sh_audio_t *sh_audio = d_audio->sh;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
745 sh_video_t *sh_video = d_video->sh;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
746 off_t newpos;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
747 off_t res;
24469
afbab72dbf2c Do not misuse a_streams for private info, demuxer->priv is for that!
reimar
parents: 24468
diff changeset
748 TiVoInfo *tivo = demuxer->priv;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
749
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
750 mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:Seeking to %7.1f\n", rel_seek_secs );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
751
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
752 tivo->lastAudioEnd = 0;
24463
f93cfdc6f4f5 Move timestamps to int64_t and use MP_NOPTS_VALUE
reimar
parents: 24462
diff changeset
753 tivo->lastAudioPTS = MP_NOPTS_VALUE;
f93cfdc6f4f5 Move timestamps to int64_t and use MP_NOPTS_VALUE
reimar
parents: 24462
diff changeset
754 tivo->lastVideoPTS = MP_NOPTS_VALUE;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
755 //
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
756 //================= seek in MPEG ==========================
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
757 demuxer->filepos = stream_tell( demuxer->stream );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
758
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25707
diff changeset
759 newpos = ( flags & SEEK_ABSOLUTE ) ? demuxer->movi_start : demuxer->filepos;
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
760
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25707
diff changeset
761 if( flags & SEEK_FACTOR )
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
762 // float seek 0..1
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
763 newpos += ( demuxer->movi_end - demuxer->movi_start ) * rel_seek_secs;
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
764 else
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
765 {
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
766 // time seek (secs)
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
767 if( ! sh_video->i_bps ) // unspecified or VBR
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
768 newpos += 2324 * 75 * rel_seek_secs; // 174.3 kbyte/sec
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
769 else
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
770 newpos += sh_video->i_bps * rel_seek_secs;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
771 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
772
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
773 if ( newpos < demuxer->movi_start )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
774 {
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
775 if( demuxer->stream->type != STREAMTYPE_VCD ) demuxer->movi_start = 0;
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
776 if( newpos < demuxer->movi_start ) newpos = demuxer->movi_start;
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
777 }
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
778
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
779 res = newpos / CHUNKSIZE;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
780 if ( rel_seek_secs >= 0 )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
781 newpos = ( res + 1 ) * CHUNKSIZE;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
782 else
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
783 newpos = res * CHUNKSIZE;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
784
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
785 if ( newpos < 0 )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
786 newpos = 0;
15581
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
787
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
788 tivo->whichChunk = newpos / CHUNKSIZE;
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
789
2e621c99354d a cleaned-up version of ty demuxer improvements found in tivo-mplayer fork.
joey
parents: 15580
diff changeset
790 stream_seek( demuxer->stream, newpos );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
791
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
792 // re-sync video:
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
793 videobuf_code_len = 0; // reset ES stream buffer
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
794
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
795 ds_fill_buffer( d_video );
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
796 if( sh_audio )
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
797 ds_fill_buffer( d_audio );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
798
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
799 while( 1 )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
800 {
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
801 int i;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
802 if( sh_audio && !d_audio->eof && d_video->pts && d_audio->pts )
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
803 {
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
804 float a_pts = d_audio->pts;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
805 a_pts += ( ds_tell_pts( d_audio ) - sh_audio->a_in_buffer_len ) /
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
806 (float)sh_audio->i_bps;
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
807 if( d_video->pts > a_pts )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
808 {
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
809 skip_audio_frame( sh_audio ); // sync audio
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
810 continue;
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
811 }
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
812 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
813 i = sync_video_packet( d_video );
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
814 if( i == 0x1B3 || i == 0x1B8 ) break; // found it!
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
815 if( !i || !skip_video_packet( d_video ) ) break; // EOF?
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
816 }
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
817 if ( subcc_enabled )
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
818 ty_ClearOSD( 0 );
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
819 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
820
24443
96dc3e753182 Make demux_ty internal functions static
reimar
parents: 24442
diff changeset
821 static int demux_ty_control( demuxer_t *demuxer,int cmd, void *arg )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
822 {
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
823 demux_stream_t *d_video = demuxer->video;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
824 sh_video_t *sh_video = d_video->sh;
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
825
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
826 switch(cmd)
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
827 {
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
828 case DEMUXER_CTRL_GET_TIME_LENGTH:
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
829 if(!sh_video->i_bps) // unspecified or VBR
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
830 return DEMUXER_CTRL_DONTKNOW;
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
831 *(double *)arg=
24446
c9870762ddb5 Cosmetics: remove lots of useless () and {}.
reimar
parents: 24445
diff changeset
832 (double)demuxer->movi_end-demuxer->movi_start/sh_video->i_bps;
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
833 return DEMUXER_CTRL_GUESS;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
834
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
835 case DEMUXER_CTRL_GET_PERCENT_POS:
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
836 return DEMUXER_CTRL_DONTKNOW;
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
837 default:
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
838 return DEMUXER_CTRL_NOTIMPL;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
839 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
840 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
841
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
842
17174
83a8c738be89 make demuxer seek and close functions return void, patch by Dominik Mierzejewski
wanderer
parents: 17012
diff changeset
843 static void demux_close_ty( demuxer_t *demux )
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
844 {
24469
afbab72dbf2c Do not misuse a_streams for private info, demuxer->priv is for that!
reimar
parents: 24468
diff changeset
845 TiVoInfo *tivo = demux->priv;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
846
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
847 free( tivo );
24487
f364db0d1067 Remove tabs and trailing whitespace
reimar
parents: 24486
diff changeset
848 sub_justify = 0;
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
849 }
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
850
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents:
diff changeset
851
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
852 static int ty_check_file(demuxer_t* demuxer)
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
853 {
24469
afbab72dbf2c Do not misuse a_streams for private info, demuxer->priv is for that!
reimar
parents: 24468
diff changeset
854 TiVoInfo *tivo = calloc(1, sizeof(TiVoInfo));
afbab72dbf2c Do not misuse a_streams for private info, demuxer->priv is for that!
reimar
parents: 24468
diff changeset
855 demuxer->priv = tivo;
33914
9ed8b7b1b94a Ensure filepos is initialized before following code tries to use it.
reimar
parents: 32467
diff changeset
856 demuxer->filepos = stream_tell( demuxer->stream );
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
857 return ds_fill_buffer(demuxer->video) ? DEMUXER_TYPE_MPEG_TY : 0;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
858 }
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
859
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
860
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
861 static demuxer_t* demux_open_ty(demuxer_t* demuxer)
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
862 {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
863 sh_audio_t *sh_audio=NULL;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
864 sh_video_t *sh_video=NULL;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
865
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
866 sh_video=demuxer->video->sh;sh_video->ds=demuxer->video;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
867
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
868 if(demuxer->audio->id!=-2) {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
869 if(!ds_fill_buffer(demuxer->audio)){
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
870 mp_msg(MSGT_DEMUXER,MSGL_INFO,"MPEG: " MSGTR_MissingAudioStream);
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
871 demuxer->audio->sh=NULL;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
872 } else {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
873 sh_audio=demuxer->audio->sh;sh_audio->ds=demuxer->audio;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
874 }
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
875 }
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
876
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
877 return demuxer;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
878 }
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
879
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
880
25707
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 24507
diff changeset
881 const demuxer_desc_t demuxer_desc_mpeg_ty = {
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
882 "TiVo demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
883 "tivo",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
884 "TiVo",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
885 "Christopher R. Wingert",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
886 "Demux streams from TiVo",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
887 DEMUXER_TYPE_MPEG_TY,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
888 0, // unsafe autodetect
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
889 ty_check_file,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
890 demux_ty_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
891 demux_open_ty,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
892 demux_close_ty,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
893 demux_seek_ty,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
894 demux_ty_control
6b86089c2edd Demuxer modularization
rtognimp
parents: 15581
diff changeset
895 };