annotate libmpdemux/demuxer.c @ 33338:4cf10c6071fd

Remove unused variable.
author reimar
date Sat, 07 May 2011 20:30:14 +0000
parents a8619bfabf84
children 45e772bf4d6a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
29238
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
1 /*
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
2 * DEMUXER v2.5
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
3 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
4 * This file is part of MPlayer.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
5 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
6 * MPlayer is free software; you can redistribute it and/or modify
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
7 * it under the terms of the GNU General Public License as published by
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
8 * the Free Software Foundation; either version 2 of the License, or
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
9 * (at your option) any later version.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
10 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
11 * MPlayer is distributed in the hope that it will be useful,
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
14 * GNU General Public License for more details.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
15 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
16 * You should have received a copy of the GNU General Public License along
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
17 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 29056
diff changeset
19 */
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
21 #include <stdio.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
22 #include <stdlib.h>
3150
8dae87740d33 bad malloc+strcpy => strdup
arpi
parents: 3101
diff changeset
23 #include <string.h>
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
24 #include <unistd.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
25
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1421
diff changeset
26 #include <sys/types.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1421
diff changeset
27 #include <sys/stat.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1421
diff changeset
28
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
29 #include "config.h"
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
30 #include "mp_msg.h"
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1567
diff changeset
31 #include "help_mp.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16925
diff changeset
32 #include "m_config.h"
32043
f6249bc89c38 Move extern declarations used by both mplayer.c and mencoder.c to mpcommon.h.
diego
parents: 31960
diff changeset
33 #include "mpcommon.h"
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
34
17200
a1b8eeffdfcd include fastmemcpy.h before stream.h, so it is used for the stream_read
reimar
parents: 17012
diff changeset
35 #include "libvo/fastmemcpy.h"
a1b8eeffdfcd include fastmemcpy.h before stream.h, so it is used for the stream_read
reimar
parents: 17012
diff changeset
36
22605
4d81dbdf46b9 Add explicit location for headers from the stream/ directory.
diego
parents: 22488
diff changeset
37 #include "stream/stream.h"
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
38 #include "demuxer.h"
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
39 #include "stheader.h"
4551
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
40 #include "mf.h"
31418
d2fd0e4d0b9a Move hr_mp3_seek extern variable declaration to demux_audio.h.
diego
parents: 31272
diff changeset
41 #include "demux_audio.h"
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
42
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16925
diff changeset
43 #include "libaf/af_format.h"
32344
0e036289e7ef Replace forward declarations of resync_{audio|video}_stream by proper #includes.
diego
parents: 32337
diff changeset
44 #include "libmpcodecs/dec_audio.h"
0e036289e7ef Replace forward declarations of resync_{audio|video}_stream by proper #includes.
diego
parents: 32337
diff changeset
45 #include "libmpcodecs/dec_video.h"
29832
07a96d936943 Free demuxer->teletext when closing the demuxer.
reimar
parents: 29770
diff changeset
46 #include "libmpcodecs/dec_teletext.h"
31960
1ba5eef167aa Refactor more instances of avcodec_initialized handling into init_avcodec().
diego
parents: 31949
diff changeset
47 #include "libmpcodecs/vd_ffmpeg.h"
5084
2fd327bf64fc added get_sh_video/audio and realmedia seeking
alex
parents: 5068
diff changeset
48
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27282
diff changeset
49 #ifdef CONFIG_ASS
25654
0190aa38aae2 Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents: 25652
diff changeset
50 #include "libass/ass.h"
32461
bc43cf7638e6 Move ass_mp.[ch] to the sub directory.
cigaes
parents: 32449
diff changeset
51 #include "sub/ass_mp.h"
25654
0190aa38aae2 Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents: 25652
diff changeset
52 #endif
0190aa38aae2 Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents: 25652
diff changeset
53
32142
4614728cab25 build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents: 32062
diff changeset
54 #ifdef CONFIG_FFMPEG
27282
16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents: 27059
diff changeset
55 #include "libavcodec/avcodec.h"
16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents: 27059
diff changeset
56 #if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE
16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents: 27059
diff changeset
57 #error MP_INPUT_BUFFER_PADDING_SIZE is too small!
16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents: 27059
diff changeset
58 #endif
16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents: 27059
diff changeset
59 #endif
16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents: 27059
diff changeset
60
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
61 // This is quite experimental, in particular it will mess up the pts values
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
62 // in the queue - on the other hand it might fix some issues like generating
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
63 // broken files with mencoder and stream copy.
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
64 // Better leave it disabled for now, if we find no use for it this code should
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
65 // just be removed again.
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
66 #define PARSE_ON_ADD 0
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
67
30379
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
68 static void clear_parser(sh_common_t *sh);
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
69
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
70 // Demuxer list
25707
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
71 extern const demuxer_desc_t demuxer_desc_rawaudio;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
72 extern const demuxer_desc_t demuxer_desc_rawvideo;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
73 extern const demuxer_desc_t demuxer_desc_tv;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
74 extern const demuxer_desc_t demuxer_desc_mf;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
75 extern const demuxer_desc_t demuxer_desc_avi;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
76 extern const demuxer_desc_t demuxer_desc_y4m;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
77 extern const demuxer_desc_t demuxer_desc_asf;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
78 extern const demuxer_desc_t demuxer_desc_real;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
79 extern const demuxer_desc_t demuxer_desc_smjpeg;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
80 extern const demuxer_desc_t demuxer_desc_matroska;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
81 extern const demuxer_desc_t demuxer_desc_realaudio;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
82 extern const demuxer_desc_t demuxer_desc_vqf;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
83 extern const demuxer_desc_t demuxer_desc_mov;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
84 extern const demuxer_desc_t demuxer_desc_vivo;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
85 extern const demuxer_desc_t demuxer_desc_fli;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
86 extern const demuxer_desc_t demuxer_desc_film;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
87 extern const demuxer_desc_t demuxer_desc_roq;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
88 extern const demuxer_desc_t demuxer_desc_gif;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
89 extern const demuxer_desc_t demuxer_desc_ogg;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
90 extern const demuxer_desc_t demuxer_desc_avs;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
91 extern const demuxer_desc_t demuxer_desc_pva;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
92 extern const demuxer_desc_t demuxer_desc_nsv;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
93 extern const demuxer_desc_t demuxer_desc_mpeg_ts;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
94 extern const demuxer_desc_t demuxer_desc_lmlm4;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
95 extern const demuxer_desc_t demuxer_desc_mpeg_ps;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
96 extern const demuxer_desc_t demuxer_desc_mpeg_pes;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
97 extern const demuxer_desc_t demuxer_desc_mpeg_es;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
98 extern const demuxer_desc_t demuxer_desc_mpeg_gxf;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
99 extern const demuxer_desc_t demuxer_desc_mpeg4_es;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
100 extern const demuxer_desc_t demuxer_desc_h264_es;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
101 extern const demuxer_desc_t demuxer_desc_rawdv;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
102 extern const demuxer_desc_t demuxer_desc_mpc;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
103 extern const demuxer_desc_t demuxer_desc_audio;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
104 extern const demuxer_desc_t demuxer_desc_xmms;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
105 extern const demuxer_desc_t demuxer_desc_mpeg_ty;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
106 extern const demuxer_desc_t demuxer_desc_rtp;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
107 extern const demuxer_desc_t demuxer_desc_rtp_nemesi;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
108 extern const demuxer_desc_t demuxer_desc_lavf;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
109 extern const demuxer_desc_t demuxer_desc_lavf_preferred;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
110 extern const demuxer_desc_t demuxer_desc_aac;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
111 extern const demuxer_desc_t demuxer_desc_nut;
28018
4ac70bd6acac MNG demuxer by Stefan Schuermans, stefan blinkenarea org
diego
parents: 27397
diff changeset
112 extern const demuxer_desc_t demuxer_desc_mng;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
113
25876
edfe8baed49f copy note on new demuxers and codecs to the top of the array as well to be
ivo
parents: 25872
diff changeset
114 /* Please do not add any new demuxers here. If you want to implement a new
25880
4df11ac927fc clarify comments/docs about lav* being the preferred place to implement new
ivo
parents: 25876
diff changeset
115 * demuxer, add it to libavformat, except for wrappers around external
4df11ac927fc clarify comments/docs about lav* being the preferred place to implement new
ivo
parents: 25876
diff changeset
116 * libraries and demuxers requiring binary support. */
25876
edfe8baed49f copy note on new demuxers and codecs to the top of the array as well to be
ivo
parents: 25872
diff changeset
117
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
118 const demuxer_desc_t *const demuxer_list[] = {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
119 &demuxer_desc_rawaudio,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
120 &demuxer_desc_rawvideo,
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27282
diff changeset
121 #ifdef CONFIG_TV
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
122 &demuxer_desc_tv,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
123 #endif
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
124 &demuxer_desc_mf,
32142
4614728cab25 build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents: 32062
diff changeset
125 #ifdef CONFIG_FFMPEG
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
126 &demuxer_desc_lavf_preferred,
23069
93948eb0280f demuxer_desc_lavf_preferred depends on USE_LIBAVFORMAT or USE_LIBAVFORMAT_SO
nicodvb
parents: 22971
diff changeset
127 #endif
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
128 &demuxer_desc_avi,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
129 &demuxer_desc_y4m,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
130 &demuxer_desc_asf,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
131 &demuxer_desc_nsv,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
132 &demuxer_desc_real,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
133 &demuxer_desc_smjpeg,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
134 &demuxer_desc_matroska,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
135 &demuxer_desc_realaudio,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
136 &demuxer_desc_vqf,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
137 &demuxer_desc_mov,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
138 &demuxer_desc_vivo,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
139 &demuxer_desc_fli,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
140 &demuxer_desc_film,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
141 &demuxer_desc_roq,
27385
2113bd9c6bd9 Rename preprocessor directives related to image libraries.
diego
parents: 27363
diff changeset
142 #ifdef CONFIG_GIF
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
143 &demuxer_desc_gif,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
144 #endif
27363
40057010b1fa Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents: 27341
diff changeset
145 #ifdef CONFIG_OGGVORBIS
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
146 &demuxer_desc_ogg,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
147 #endif
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27282
diff changeset
148 #ifdef CONFIG_WIN32DLL
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
149 &demuxer_desc_avs,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
150 #endif
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
151 &demuxer_desc_pva,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
152 &demuxer_desc_mpeg_ts,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
153 &demuxer_desc_lmlm4,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
154 &demuxer_desc_mpeg_ps,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
155 &demuxer_desc_mpeg_pes,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
156 &demuxer_desc_mpeg_es,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
157 &demuxer_desc_mpeg_gxf,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
158 &demuxer_desc_mpeg4_es,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
159 &demuxer_desc_h264_es,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
160 &demuxer_desc_audio,
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
161 &demuxer_desc_mpeg_ty,
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27395
diff changeset
162 #ifdef CONFIG_LIVE555
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
163 &demuxer_desc_rtp,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
164 #endif
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27395
diff changeset
165 #ifdef CONFIG_LIBNEMESI
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
166 &demuxer_desc_rtp_nemesi,
25266
239330301b33 Make libnemesi use specific struct and DEMUXER_TYPE
lu_zero
parents: 25197
diff changeset
167 #endif
32142
4614728cab25 build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents: 32062
diff changeset
168 #ifdef CONFIG_FFMPEG
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
169 &demuxer_desc_lavf,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
170 #endif
27395
587716f0b4cc 10l: MUSEPACK --> CONFIG_MUSEPACK
diego
parents: 27391
diff changeset
171 #ifdef CONFIG_MUSEPACK
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
172 &demuxer_desc_mpc,
26873
a90971b955af Move native musepack demuxer further down in demuxer list
reimar
parents: 26758
diff changeset
173 #endif
27363
40057010b1fa Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents: 27341
diff changeset
174 #ifdef CONFIG_LIBDV095
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
175 &demuxer_desc_rawdv,
18900
0b53e6d1b27f move some ill-behaving demuxers further down the list
reimar
parents: 18708
diff changeset
176 #endif
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
177 &demuxer_desc_aac,
27363
40057010b1fa Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents: 27341
diff changeset
178 #ifdef CONFIG_LIBNUT
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
179 &demuxer_desc_nut,
19861
b251bca5820c Add demux_nut to MPlayer repo
ods15
parents: 19540
diff changeset
180 #endif
27391
1d2faa1020fb Rename a bunch of miscellaneous preprocessor directives.
diego
parents: 27385
diff changeset
181 #ifdef CONFIG_XMMS
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
182 &demuxer_desc_xmms,
18900
0b53e6d1b27f move some ill-behaving demuxers further down the list
reimar
parents: 18708
diff changeset
183 #endif
28018
4ac70bd6acac MNG demuxer by Stefan Schuermans, stefan blinkenarea org
diego
parents: 27397
diff changeset
184 #ifdef CONFIG_MNG
4ac70bd6acac MNG demuxer by Stefan Schuermans, stefan blinkenarea org
diego
parents: 27397
diff changeset
185 &demuxer_desc_mng,
4ac70bd6acac MNG demuxer by Stefan Schuermans, stefan blinkenarea org
diego
parents: 27397
diff changeset
186 #endif
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
187 /* Please do not add any new demuxers here. If you want to implement a new
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
188 * demuxer, add it to libavformat, except for wrappers around external
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
189 * libraries and demuxers requiring binary support. */
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
190 NULL
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
191 };
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
192
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
193 void free_demuxer_stream(demux_stream_t *ds)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
194 {
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
195 ds_free_packs(ds);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
196 free(ds);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
197 }
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
198
30644
390c8d36d463 Drop weird and unnecessary _s/_st suffixes from demuxer struct names.
diego
parents: 30626
diff changeset
199 demux_stream_t *new_demuxer_stream(struct demuxer *demuxer, int id)
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
200 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
201 demux_stream_t *ds = malloc(sizeof(demux_stream_t));
29770
db80b9d20406 demuxer.c: Add initialization missing from previous commit
uau
parents: 29634
diff changeset
202 *ds = (demux_stream_t){
db80b9d20406 demuxer.c: Add initialization missing from previous commit
uau
parents: 29634
diff changeset
203 .id = id,
db80b9d20406 demuxer.c: Add initialization missing from previous commit
uau
parents: 29634
diff changeset
204 .demuxer = demuxer,
db80b9d20406 demuxer.c: Add initialization missing from previous commit
uau
parents: 29634
diff changeset
205 .asf_seq = -1,
db80b9d20406 demuxer.c: Add initialization missing from previous commit
uau
parents: 29634
diff changeset
206 };
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
207 return ds;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
208 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
209
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
210
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
211 /**
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
212 * Get demuxer description structure for a given demuxer type
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
213 *
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
214 * @param file_format type of the demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
215 * @return structure for the demuxer, NULL if not found
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
216 */
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
217 static const demuxer_desc_t *get_demuxer_desc_from_type(int file_format)
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
218 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
219 int i;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
220
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
221 for (i = 0; demuxer_list[i]; i++)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
222 if (file_format == demuxer_list[i]->type)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
223 return demuxer_list[i];
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
224
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
225 return NULL;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
226 }
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
227
33237
a8619bfabf84 Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents: 33189
diff changeset
228 demuxer_t *alloc_demuxer(stream_t *stream, int type, const char *filename)
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
229 {
32448
aa237330969d Replace malloc+memset by calloc.
reimar
parents: 32344
diff changeset
230 demuxer_t *d = calloc(1, sizeof(*d));
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
231 d->stream = stream;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
232 d->stream_pts = MP_NOPTS_VALUE;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
233 d->reference_clock = MP_NOPTS_VALUE;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
234 d->movi_start = stream->start_pos;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
235 d->movi_end = stream->end_pos;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
236 d->seekable = 1;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
237 d->synced = 0;
29486
a373af1e3b24 Handle demuxers that never set filepos by using stream_tell.
reimar
parents: 29366
diff changeset
238 d->filepos = -1;
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
239 d->type = type;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
240 if (type)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
241 if (!(d->desc = get_demuxer_desc_from_type(type)))
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
242 mp_msg(MSGT_DEMUXER, MSGL_ERR,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
243 "BUG! Invalid demuxer type in new_demuxer(), "
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
244 "big troubles ahead.");
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
245 if (filename) // Filename hack for avs_check_file
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
246 d->filename = strdup(filename);
33237
a8619bfabf84 Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents: 33189
diff changeset
247 return d;
a8619bfabf84 Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents: 33189
diff changeset
248 }
a8619bfabf84 Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents: 33189
diff changeset
249
a8619bfabf84 Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents: 33189
diff changeset
250 demuxer_t *new_demuxer(stream_t *stream, int type, int a_id, int v_id,
a8619bfabf84 Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents: 33189
diff changeset
251 int s_id, char *filename)
a8619bfabf84 Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents: 33189
diff changeset
252 {
a8619bfabf84 Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents: 33189
diff changeset
253 demuxer_t *d = alloc_demuxer(stream, type, filename);
a8619bfabf84 Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents: 33189
diff changeset
254 d->audio = new_demuxer_stream(d, a_id);
a8619bfabf84 Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents: 33189
diff changeset
255 d->video = new_demuxer_stream(d, v_id);
a8619bfabf84 Add a alloc_demuxer function that ensures all the critical stuff is
reimar
parents: 33189
diff changeset
256 d->sub = new_demuxer_stream(d, s_id);
30626
27b133678bbd Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents: 30624
diff changeset
257 stream->eof = 0;
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
258 stream_seek(stream, stream->start_pos);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
259 return d;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
260 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
261
31925
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31609
diff changeset
262 const char *sh_sub_type2str(int type)
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31609
diff changeset
263 {
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31609
diff changeset
264 switch (type) {
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31609
diff changeset
265 case 't': return "text";
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31609
diff changeset
266 case 'm': return "movtext";
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31609
diff changeset
267 case 'a': return "ass";
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31609
diff changeset
268 case 'v': return "vobsub";
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31609
diff changeset
269 case 'x': return "xsub";
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31609
diff changeset
270 case 'b': return "dvb";
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31609
diff changeset
271 case 'd': return "dvb-teletext";
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31609
diff changeset
272 case 'p': return "hdmv pgs";
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31609
diff changeset
273 }
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31609
diff changeset
274 return "unknown";
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31609
diff changeset
275 }
616375aefdda Print subtitle type also for internally-supported types with a libavcodec decoder.
reimar
parents: 31609
diff changeset
276
31609
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 31558
diff changeset
277 sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid, const char *lang)
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
278 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
279 if (id > MAX_S_STREAMS - 1 || id < 0) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
280 mp_msg(MSGT_DEMUXER, MSGL_WARN,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
281 "Requested sub stream id overflow (%d > %d)\n", id,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
282 MAX_S_STREAMS);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
283 return NULL;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
284 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
285 if (demuxer->s_streams[id])
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
286 mp_msg(MSGT_DEMUXER, MSGL_WARN, "Sub stream %i redefined\n", id);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
287 else {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
288 sh_sub_t *sh = calloc(1, sizeof(sh_sub_t));
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
289 demuxer->s_streams[id] = sh;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
290 sh->sid = sid;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
291 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid);
31609
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 31558
diff changeset
292 if (lang && lang[0] && strcmp(lang, "und")) {
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 31558
diff changeset
293 sh->lang = strdup(lang);
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 31558
diff changeset
294 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", sid, lang);
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 31558
diff changeset
295 }
32449
f39c946f7ff7 Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents: 32448
diff changeset
296 if (sid == dvdsub_id) {
f39c946f7ff7 Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents: 32448
diff changeset
297 demuxer->sub->id = id;
f39c946f7ff7 Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents: 32448
diff changeset
298 demuxer->sub->sh = demuxer->s_streams[id];
f39c946f7ff7 Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents: 32448
diff changeset
299 }
29056
93e72ef080ab Update demuxer->sub->id and demuxer->sub->sh if a new subtitle stream is
reimar
parents: 28872
diff changeset
300 }
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
301 return demuxer->s_streams[id];
20872
a8b42366e68a Make subtitle stream handling more similar to audio and video streams.
reimar
parents: 20851
diff changeset
302 }
a8b42366e68a Make subtitle stream handling more similar to audio and video streams.
reimar
parents: 20851
diff changeset
303
30570
98dc6ae7ede2 libmpdemux: Mark functions not used outside of their files as static.
diego
parents: 30396
diff changeset
304 static void free_sh_sub(sh_sub_t *sh)
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
305 {
23592
76bed8202233 Fix memleak due to not freeing demuxer->s_streams
reimar
parents: 23552
diff changeset
306 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_sub at %p\n", sh);
26085
681f6ae38b68 Remove stupid checks of free() argument.
eugeni
parents: 26082
diff changeset
307 free(sh->extradata);
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27282
diff changeset
308 #ifdef CONFIG_ASS
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
309 if (sh->ass_track)
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
310 ass_free_track(sh->ass_track);
25702
c4275201a489 Add a forgotten #ifdef USE_ASS around ass_free_track
reimar
parents: 25657
diff changeset
311 #endif
26082
026b1ac69d47 Add language info to sh_sub_t and sh_audio_t.
eugeni
parents: 26071
diff changeset
312 free(sh->lang);
32142
4614728cab25 build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents: 32062
diff changeset
313 #ifdef CONFIG_FFMPEG
30379
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
314 clear_parser((sh_common_t *)sh);
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
315 #endif
23592
76bed8202233 Fix memleak due to not freeing demuxer->s_streams
reimar
parents: 23552
diff changeset
316 free(sh);
76bed8202233 Fix memleak due to not freeing demuxer->s_streams
reimar
parents: 23552
diff changeset
317 }
76bed8202233 Fix memleak due to not freeing demuxer->s_streams
reimar
parents: 23552
diff changeset
318
31609
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 31558
diff changeset
319 sh_audio_t *new_sh_audio_aid(demuxer_t *demuxer, int id, int aid, const char *lang)
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
320 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
321 if (id > MAX_A_STREAMS - 1 || id < 0) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
322 mp_msg(MSGT_DEMUXER, MSGL_WARN,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
323 "Requested audio stream id overflow (%d > %d)\n", id,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
324 MAX_A_STREAMS);
27052
79e51c2fdb00 M-x untabify
diego
parents: 27051
diff changeset
325 return NULL;
4642
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4587
diff changeset
326 }
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
327 if (demuxer->a_streams[id])
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
328 mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_AudioStreamRedefined, id);
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
329 else {
26874
c73c138aad88 Cosmetics: simplify
reimar
parents: 26873
diff changeset
330 sh_audio_t *sh = calloc(1, sizeof(sh_audio_t));
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
331 mp_msg(MSGT_DEMUXER, MSGL_V, MSGTR_FoundAudioStream, id);
26874
c73c138aad88 Cosmetics: simplify
reimar
parents: 26873
diff changeset
332 demuxer->a_streams[id] = sh;
26875
c276296cb6f8 Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents: 26874
diff changeset
333 sh->aid = aid;
26876
d99d0f7c0e80 Initialize sh_audio/sh_video->ds
reimar
parents: 26875
diff changeset
334 sh->ds = demuxer->audio;
13357
c605df89ca9f moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents: 13301
diff changeset
335 // set some defaults
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
336 sh->samplesize = 2;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
337 sh->sample_format = AF_FORMAT_S16_NE;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
338 sh->audio_out_minsize = 8192; /* default size, maybe not enough for Win32/ACM */
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
339 sh->pts = MP_NOPTS_VALUE;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
340 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", aid);
31609
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 31558
diff changeset
341 if (lang && lang[0] && strcmp(lang, "und")) {
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 31558
diff changeset
342 sh->lang = strdup(lang);
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 31558
diff changeset
343 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", aid, lang);
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 31558
diff changeset
344 }
32449
f39c946f7ff7 Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents: 32448
diff changeset
345 if (aid == audio_id) {
f39c946f7ff7 Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents: 32448
diff changeset
346 demuxer->audio->id = id;
f39c946f7ff7 Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents: 32448
diff changeset
347 demuxer->audio->sh = demuxer->a_streams[id];
f39c946f7ff7 Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents: 32448
diff changeset
348 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
349 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
350 return demuxer->a_streams[id];
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
351 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
352
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
353 void free_sh_audio(demuxer_t *demuxer, int id)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
354 {
18708
9e2b300db17b Change free_sh_audio() to take demuxer and stream id as parameters
uau
parents: 18404
diff changeset
355 sh_audio_t *sh = demuxer->a_streams[id];
9e2b300db17b Change free_sh_audio() to take demuxer and stream id as parameters
uau
parents: 18404
diff changeset
356 demuxer->a_streams[id] = NULL;
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
357 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_audio at %p\n", sh);
26085
681f6ae38b68 Remove stupid checks of free() argument.
eugeni
parents: 26082
diff changeset
358 free(sh->wf);
681f6ae38b68 Remove stupid checks of free() argument.
eugeni
parents: 26082
diff changeset
359 free(sh->codecdata);
26082
026b1ac69d47 Add language info to sh_sub_t and sh_audio_t.
eugeni
parents: 26071
diff changeset
360 free(sh->lang);
32142
4614728cab25 build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents: 32062
diff changeset
361 #ifdef CONFIG_FFMPEG
30379
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
362 clear_parser((sh_common_t *)sh);
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
363 #endif
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
364 free(sh);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
365 }
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
366
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
367 sh_video_t *new_sh_video_vid(demuxer_t *demuxer, int id, int vid)
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
368 {
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
369 if (id > MAX_V_STREAMS - 1 || id < 0) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
370 mp_msg(MSGT_DEMUXER, MSGL_WARN,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
371 "Requested video stream id overflow (%d > %d)\n", id,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
372 MAX_V_STREAMS);
27052
79e51c2fdb00 M-x untabify
diego
parents: 27051
diff changeset
373 return NULL;
4642
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4587
diff changeset
374 }
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
375 if (demuxer->v_streams[id])
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
376 mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_VideoStreamRedefined, id);
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
377 else {
26875
c276296cb6f8 Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents: 26874
diff changeset
378 sh_video_t *sh = calloc(1, sizeof(sh_video_t));
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
379 mp_msg(MSGT_DEMUXER, MSGL_V, MSGTR_FoundVideoStream, id);
26875
c276296cb6f8 Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents: 26874
diff changeset
380 demuxer->v_streams[id] = sh;
c276296cb6f8 Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents: 26874
diff changeset
381 sh->vid = vid;
26876
d99d0f7c0e80 Initialize sh_audio/sh_video->ds
reimar
parents: 26875
diff changeset
382 sh->ds = demuxer->video;
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
383 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", vid);
32449
f39c946f7ff7 Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents: 32448
diff changeset
384 if (vid == video_id) {
f39c946f7ff7 Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents: 32448
diff changeset
385 demuxer->video->id = id;
f39c946f7ff7 Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents: 32448
diff changeset
386 demuxer->video->sh = demuxer->v_streams[id];
f39c946f7ff7 Consistency fix: select track specified by -aid/-vid/-sid automatically
reimar
parents: 32448
diff changeset
387 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
388 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
389 return demuxer->v_streams[id];
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
390 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
391
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
392 void free_sh_video(sh_video_t *sh)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
393 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
394 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_video at %p\n", sh);
26085
681f6ae38b68 Remove stupid checks of free() argument.
eugeni
parents: 26082
diff changeset
395 free(sh->bih);
32142
4614728cab25 build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents: 32062
diff changeset
396 #ifdef CONFIG_FFMPEG
30379
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
397 clear_parser((sh_common_t *)sh);
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
398 #endif
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
399 free(sh);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
400 }
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
401
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
402 void free_demuxer(demuxer_t *demuxer)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
403 {
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
404 int i;
30624
60818f87a285 Print demuxer name in "freeing demuxer" message.
reimar
parents: 30570
diff changeset
405 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing %s demuxer at %p\n",
60818f87a285 Print demuxer name in "freeing demuxer" message.
reimar
parents: 30570
diff changeset
406 demuxer->desc->shortdesc, demuxer);
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
407 if (demuxer->desc->close)
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
408 demuxer->desc->close(demuxer);
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
409 // Very ugly hack to make it behave like old implementation
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
410 if (demuxer->desc->type == DEMUXER_TYPE_DEMUXERS)
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
411 goto skip_streamfree;
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
412 // free streams:
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
413 for (i = 0; i < MAX_A_STREAMS; i++)
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
414 if (demuxer->a_streams[i])
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
415 free_sh_audio(demuxer, i);
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
416 for (i = 0; i < MAX_V_STREAMS; i++)
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
417 if (demuxer->v_streams[i])
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
418 free_sh_video(demuxer->v_streams[i]);
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
419 for (i = 0; i < MAX_S_STREAMS; i++)
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
420 if (demuxer->s_streams[i])
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
421 free_sh_sub(demuxer->s_streams[i]);
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
422 // free demuxers:
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
423 free_demuxer_stream(demuxer->audio);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
424 free_demuxer_stream(demuxer->video);
5412
db582be1b590 added soem debug prints, and fixed 10l bug of Alban
arpi
parents: 5214
diff changeset
425 free_demuxer_stream(demuxer->sub);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
426 skip_streamfree:
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
427 if (demuxer->info) {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
428 for (i = 0; demuxer->info[i] != NULL; i++)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
429 free(demuxer->info[i]);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
430 free(demuxer->info);
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4660
diff changeset
431 }
26085
681f6ae38b68 Remove stupid checks of free() argument.
eugeni
parents: 26082
diff changeset
432 free(demuxer->filename);
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
433 if (demuxer->chapters) {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
434 for (i = 0; i < demuxer->num_chapters; i++)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
435 free(demuxer->chapters[i].name);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
436 free(demuxer->chapters);
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
437 }
25657
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
438 if (demuxer->attachments) {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
439 for (i = 0; i < demuxer->num_attachments; i++) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
440 free(demuxer->attachments[i].name);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
441 free(demuxer->attachments[i].type);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
442 free(demuxer->attachments[i].data);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
443 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
444 free(demuxer->attachments);
25657
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
445 }
29832
07a96d936943 Free demuxer->teletext when closing the demuxer.
reimar
parents: 29770
diff changeset
446 if (demuxer->teletext)
07a96d936943 Free demuxer->teletext when closing the demuxer.
reimar
parents: 29770
diff changeset
447 teletext_control(demuxer->teletext, TV_VBI_CONTROL_STOP, NULL);
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
448 free(demuxer);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
449 }
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
450
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
451
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
452 static void ds_add_packet_internal(demux_stream_t *ds, demux_packet_t *dp)
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
453 {
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
454 // append packet to DS stream:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
455 ++ds->packs;
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
456 ds->bytes += dp->len;
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
457 if (ds->last) {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
458 // next packet in stream
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
459 ds->last->next = dp;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
460 ds->last = dp;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
461 } else {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
462 // first packet in stream
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
463 ds->first = ds->last = dp;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
464 }
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
465 mp_dbg(MSGT_DEMUXER, MSGL_DBG2,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
466 "DEMUX: Append packet to %s, len=%d pts=%5.3f pos=%u [packs: A=%d V=%d]\n",
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
467 (ds == ds->demuxer->audio) ? "d_audio" : "d_video", dp->len,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
468 dp->pts, (unsigned int) dp->pos, ds->demuxer->audio->packs,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
469 ds->demuxer->video->packs);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
470 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
471
32142
4614728cab25 build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents: 32062
diff changeset
472 #ifdef CONFIG_FFMPEG
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
473 static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parser, unsigned format)
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
474 {
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
475 enum CodecID codec_id = CODEC_ID_NONE;
31960
1ba5eef167aa Refactor more instances of avcodec_initialized handling into init_avcodec().
diego
parents: 31949
diff changeset
476
1ba5eef167aa Refactor more instances of avcodec_initialized handling into init_avcodec().
diego
parents: 31949
diff changeset
477 init_avcodec();
1ba5eef167aa Refactor more instances of avcodec_initialized handling into init_avcodec().
diego
parents: 31949
diff changeset
478
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
479 switch (format) {
32495
cfa30cde4b69 Add support for LATM parsing.
reimar
parents: 32461
diff changeset
480 case MKTAG('M', 'P', '4', 'L'):
cfa30cde4b69 Add support for LATM parsing.
reimar
parents: 32461
diff changeset
481 codec_id = CODEC_ID_AAC_LATM;
cfa30cde4b69 Add support for LATM parsing.
reimar
parents: 32461
diff changeset
482 break;
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
483 case 0x2000:
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
484 case 0x332D6361:
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
485 case 0x332D4341:
32509
190a7fc12929 Add missing fourcc's that require libavcodec parsing.
cehoyos
parents: 32508
diff changeset
486 case 0x20736D:
32940
5bab4a2e1b59 100l, actually only dnet tag indicates byte-swapped AC-3.
reimar
parents: 32939
diff changeset
487 case MKTAG('s', 'a', 'c', '3'):
5bab4a2e1b59 100l, actually only dnet tag indicates byte-swapped AC-3.
reimar
parents: 32939
diff changeset
488 codec_id = CODEC_ID_AC3;
5bab4a2e1b59 100l, actually only dnet tag indicates byte-swapped AC-3.
reimar
parents: 32939
diff changeset
489 break;
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
490 case MKTAG('d', 'n', 'e', 't'):
32939
26bbfa0249e0 Do not run the AC-3 parser on DNET (byte-swapped AC-3), that will break badly.
reimar
parents: 32736
diff changeset
491 // DNET/byte-swapped AC-3 - there is no parser for that yet
26bbfa0249e0 Do not run the AC-3 parser on DNET (byte-swapped AC-3), that will break badly.
reimar
parents: 32736
diff changeset
492 //codec_id = CODEC_ID_DNET;
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
493 break;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
494 case MKTAG('E', 'A', 'C', '3'):
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
495 codec_id = CODEC_ID_EAC3;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
496 break;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
497 case 0x2001:
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
498 case 0x86:
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
499 codec_id = CODEC_ID_DTS;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
500 break;
32590
10b9ac971ef6 Add support for FLAC audio parsing, fixes playback time jumping
reimar
parents: 32509
diff changeset
501 case MKTAG('f', 'L', 'a', 'C'):
10b9ac971ef6 Add support for FLAC audio parsing, fixes playback time jumping
reimar
parents: 32509
diff changeset
502 codec_id = CODEC_ID_FLAC;
10b9ac971ef6 Add support for FLAC audio parsing, fixes playback time jumping
reimar
parents: 32509
diff changeset
503 break;
30385
b2c5e608155a Add support for parsing MLP and TrueHD.
reimar
parents: 30381
diff changeset
504 case MKTAG('M', 'L', 'P', ' '):
b2c5e608155a Add support for parsing MLP and TrueHD.
reimar
parents: 30381
diff changeset
505 codec_id = CODEC_ID_MLP;
b2c5e608155a Add support for parsing MLP and TrueHD.
reimar
parents: 30381
diff changeset
506 break;
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
507 case 0x55:
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
508 case 0x5500736d:
32509
190a7fc12929 Add missing fourcc's that require libavcodec parsing.
cehoyos
parents: 32508
diff changeset
509 case 0x55005354:
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
510 case MKTAG('.', 'm', 'p', '3'):
32508
ce7fa2398617 Fix typo: There is no fourcc 'MPE '.
cehoyos
parents: 32495
diff changeset
511 case MKTAG('M', 'P', '3', ' '):
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
512 case MKTAG('L', 'A', 'M', 'E'):
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
513 codec_id = CODEC_ID_MP3;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
514 break;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
515 case 0x50:
32509
190a7fc12929 Add missing fourcc's that require libavcodec parsing.
cehoyos
parents: 32508
diff changeset
516 case 0x5000736d:
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
517 case MKTAG('.', 'm', 'p', '2'):
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
518 case MKTAG('.', 'm', 'p', '1'):
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
519 codec_id = CODEC_ID_MP2;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
520 break;
30385
b2c5e608155a Add support for parsing MLP and TrueHD.
reimar
parents: 30381
diff changeset
521 case MKTAG('T', 'R', 'H', 'D'):
b2c5e608155a Add support for parsing MLP and TrueHD.
reimar
parents: 30381
diff changeset
522 codec_id = CODEC_ID_TRUEHD;
b2c5e608155a Add support for parsing MLP and TrueHD.
reimar
parents: 30381
diff changeset
523 break;
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
524 }
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
525 if (codec_id != CODEC_ID_NONE) {
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
526 *avctx = avcodec_alloc_context();
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
527 if (!*avctx)
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
528 return;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
529 *parser = av_parser_init(codec_id);
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
530 if (!*parser)
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
531 av_freep(avctx);
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
532 }
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
533 }
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
534
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
535 static void get_parser(sh_common_t *sh, AVCodecContext **avctx, AVCodecParserContext **parser)
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
536 {
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
537 *avctx = NULL;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
538 *parser = NULL;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
539
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
540 if (!sh || !sh->needs_parsing)
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
541 return;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
542
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
543 *avctx = sh->avctx;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
544 *parser = sh->parser;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
545 if (*parser)
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
546 return;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
547
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
548 allocate_parser(avctx, parser, sh->format);
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
549 sh->avctx = *avctx;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
550 sh->parser = *parser;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
551 }
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
552
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
553 int ds_parse(demux_stream_t *ds, uint8_t **buffer, int *len, double pts, off_t pos)
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
554 {
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
555 AVCodecContext *avctx;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
556 AVCodecParserContext *parser;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
557 get_parser(ds->sh, &avctx, &parser);
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
558 if (!parser)
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
559 return *len;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
560 return av_parser_parse2(parser, avctx, buffer, len, *buffer, *len, pts, pts, pos);
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
561 }
30379
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
562
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
563 static void clear_parser(sh_common_t *sh)
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
564 {
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
565 av_parser_close(sh->parser);
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
566 sh->parser = NULL;
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
567 av_freep(&sh->avctx);
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
568 }
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
569
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
570 void ds_clear_parser(demux_stream_t *ds)
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
571 {
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
572 if (!ds->sh)
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
573 return;
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
574 clear_parser(ds->sh);
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
575 }
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
576 #endif
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
577
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
578 void ds_add_packet(demux_stream_t *ds, demux_packet_t *dp)
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
579 {
32142
4614728cab25 build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents: 32062
diff changeset
580 #if PARSE_ON_ADD && defined(CONFIG_FFMPEG)
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
581 int len = dp->len;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
582 int pos = 0;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
583 while (len > 0) {
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
584 uint8_t *parsed_start = dp->buffer + pos;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
585 int parsed_len = len;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
586 int consumed = ds_parse(ds->sh, &parsed_start, &parsed_len, dp->pts, dp->pos);
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
587 pos += consumed;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
588 len -= consumed;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
589 if (parsed_start == dp->buffer && parsed_len == dp->len) {
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
590 ds_add_packet_internal(ds, dp);
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
591 } else if (parsed_len) {
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
592 demux_packet_t *dp2 = new_demux_packet(parsed_len);
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
593 dp2->pos = dp->pos;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
594 dp2->pts = dp->pts; // should be parser->pts but that works badly
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
595 memcpy(dp2->buffer, parsed_start, parsed_len);
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
596 ds_add_packet_internal(ds, dp2);
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
597 }
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
598 }
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
599 #else
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
600 ds_add_packet_internal(ds, dp);
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
601 #endif
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
602 }
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
603
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
604 void ds_read_packet(demux_stream_t *ds, stream_t *stream, int len,
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
605 double pts, off_t pos, int flags)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
606 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
607 demux_packet_t *dp = new_demux_packet(len);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
608 len = stream_read(stream, dp->buffer, len);
10891
65ed62e138fa Fixed 'reading after EOF'. demuxers didn't check, how many they've read!
lumag
parents: 10882
diff changeset
609 resize_demux_packet(dp, len);
27045
66cda68db746 Remove pointless comments and commented-out code.
diego
parents: 26926
diff changeset
610 dp->pts = pts;
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
611 dp->pos = pos;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
612 dp->flags = flags;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
613 // append packet to DS stream:
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
614 ds_add_packet(ds, dp);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
615 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
616
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
617 // return value:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
618 // 0 = EOF or no stream found or invalid type
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
619 // 1 = successfully read a packet
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
620
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
621 int demux_fill_buffer(demuxer_t *demux, demux_stream_t *ds)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
622 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
623 // Note: parameter 'ds' can be NULL!
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
624 return demux->desc->fill_buffer(demux, ds);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
625 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
626
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
627 // return value:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
628 // 0 = EOF
25197
eb2c5925ec34 Fix typos in comments to stop them hurting my eyes
reimar
parents: 24826
diff changeset
629 // 1 = successful
26037
bee99864f397 New member in demuxer_t: reference_clock.
nicodvb
parents: 25956
diff changeset
630 #define MAX_ACUMULATED_PACKETS 64
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
631 int ds_fill_buffer(demux_stream_t *ds)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
632 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
633 demuxer_t *demux = ds->demuxer;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
634 if (ds->current)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
635 free_demux_packet(ds->current);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
636 ds->current = NULL;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
637 if (mp_msg_test(MSGT_DEMUXER, MSGL_DBG3)) {
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
638 if (ds == demux->audio)
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
639 mp_dbg(MSGT_DEMUXER, MSGL_DBG3,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
640 "ds_fill_buffer(d_audio) called\n");
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
641 else if (ds == demux->video)
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
642 mp_dbg(MSGT_DEMUXER, MSGL_DBG3,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
643 "ds_fill_buffer(d_video) called\n");
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
644 else if (ds == demux->sub)
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
645 mp_dbg(MSGT_DEMUXER, MSGL_DBG3, "ds_fill_buffer(d_sub) called\n");
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
646 else
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
647 mp_dbg(MSGT_DEMUXER, MSGL_DBG3,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
648 "ds_fill_buffer(unknown 0x%X) called\n", (unsigned int) ds);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
649 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
650 while (1) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
651 if (ds->packs) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
652 demux_packet_t *p = ds->first;
32736
a25f55874cdd Improve EOF handling in ds_fill_buffer for the case where one stream ends
reimar
parents: 32590
diff changeset
653 // obviously not yet EOF after all
a25f55874cdd Improve EOF handling in ds_fill_buffer for the case where one stream ends
reimar
parents: 32590
diff changeset
654 ds->eof = 0;
26071
449ad51bd8c7 in ds_fill_buffer() disabled the code that demuxes until the arrival of the right reference_clock
nicodvb
parents: 26037
diff changeset
655 #if 0
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
656 if (demux->reference_clock != MP_NOPTS_VALUE) {
27059
3771c9d8daf6 cosmetics: Remove useless parentheses, align.
diego
parents: 27057
diff changeset
657 if ( p->pts != MP_NOPTS_VALUE
3771c9d8daf6 cosmetics: Remove useless parentheses, align.
diego
parents: 27057
diff changeset
658 && p->pts > demux->reference_clock
3771c9d8daf6 cosmetics: Remove useless parentheses, align.
diego
parents: 27057
diff changeset
659 && ds->packs < MAX_ACUMULATED_PACKETS) {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
660 if (demux_fill_buffer(demux, ds))
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
661 continue;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
662 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
663 }
26071
449ad51bd8c7 in ds_fill_buffer() disabled the code that demuxes until the arrival of the right reference_clock
nicodvb
parents: 26037
diff changeset
664 #endif
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
665 // copy useful data:
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
666 ds->buffer = p->buffer;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
667 ds->buffer_pos = 0;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
668 ds->buffer_size = p->len;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
669 ds->pos = p->pos;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
670 ds->dpos += p->len; // !!!
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
671 ++ds->pack_no;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
672 if (p->pts != MP_NOPTS_VALUE) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
673 ds->pts = p->pts;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
674 ds->pts_bytes = 0;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
675 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
676 ds->pts_bytes += p->len; // !!!
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
677 if (p->stream_pts != MP_NOPTS_VALUE)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
678 demux->stream_pts = p->stream_pts;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
679 ds->flags = p->flags;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
680 // unlink packet:
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
681 ds->bytes -= p->len;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
682 ds->current = p;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
683 ds->first = p->next;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
684 if (!ds->first)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
685 ds->last = NULL;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
686 --ds->packs;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
687 return 1;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
688 }
32736
a25f55874cdd Improve EOF handling in ds_fill_buffer for the case where one stream ends
reimar
parents: 32590
diff changeset
689 // avoid printing the "too many ..." message over and over
a25f55874cdd Improve EOF handling in ds_fill_buffer for the case where one stream ends
reimar
parents: 32590
diff changeset
690 if (ds->eof)
a25f55874cdd Improve EOF handling in ds_fill_buffer for the case where one stream ends
reimar
parents: 32590
diff changeset
691 break;
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
692 if (demux->audio->packs >= MAX_PACKS
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
693 || demux->audio->bytes >= MAX_PACK_BYTES) {
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
694 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyAudioInBuffer,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
695 demux->audio->packs, demux->audio->bytes);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
696 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
697 break;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
698 }
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
699 if (demux->video->packs >= MAX_PACKS
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
700 || demux->video->bytes >= MAX_PACK_BYTES) {
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
701 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyVideoInBuffer,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
702 demux->video->packs, demux->video->bytes);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
703 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
704 break;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
705 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
706 if (!demux_fill_buffer(demux, ds)) {
32142
4614728cab25 build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents: 32062
diff changeset
707 #if PARSE_ON_ADD && defined(CONFIG_FFMPEG)
30088
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
708 uint8_t *parsed_start = NULL;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
709 int parsed_len = 0;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
710 ds_parse(ds->sh, &parsed_start, &parsed_len, MP_NOPTS_VALUE, 0);
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
711 if (parsed_len) {
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
712 demux_packet_t *dp2 = new_demux_packet(parsed_len);
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
713 dp2->pts = MP_NOPTS_VALUE;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
714 memcpy(dp2->buffer, parsed_start, parsed_len);
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
715 ds_add_packet_internal(ds, dp2);
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
716 continue;
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
717 }
4977e04f3a18 Add support for parsing audio streams (though should be easy to extend to video)
reimar
parents: 29832
diff changeset
718 #endif
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
719 mp_dbg(MSGT_DEMUXER, MSGL_DBG2,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
720 "ds_fill_buffer()->demux_fill_buffer() failed\n");
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
721 break; // EOF
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
722 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
723 }
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
724 ds->buffer_pos = ds->buffer_size = 0;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
725 ds->buffer = NULL;
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
726 mp_msg(MSGT_DEMUXER, MSGL_V,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
727 "ds_fill_buffer: EOF reached (stream: %s) \n",
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
728 ds == demux->audio ? "audio" : "video");
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
729 ds->eof = 1;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
730 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
731 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
732
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
733 int demux_read_data(demux_stream_t *ds, unsigned char *mem, int len)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
734 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
735 int x;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
736 int bytes = 0;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
737 while (len > 0) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
738 x = ds->buffer_size - ds->buffer_pos;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
739 if (x == 0) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
740 if (!ds_fill_buffer(ds))
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
741 return bytes;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
742 } else {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
743 if (x > len)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
744 x = len;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
745 if (mem)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
746 fast_memcpy(mem + bytes, &ds->buffer[ds->buffer_pos], x);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
747 bytes += x;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
748 len -= x;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
749 ds->buffer_pos += x;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
750 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
751 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
752 return bytes;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
753 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
754
17417
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
755 /**
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
756 * \brief read data until the given 3-byte pattern is encountered, up to maxlen
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
757 * \param mem memory to read data into, may be NULL to discard data
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
758 * \param maxlen maximum number of bytes to read
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
759 * \param read number of bytes actually read
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
760 * \param pattern pattern to search for (lowest 8 bits are ignored)
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
761 * \return whether pattern was found
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
762 */
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
763 int demux_pattern_3(demux_stream_t *ds, unsigned char *mem, int maxlen,
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
764 int *read, uint32_t pattern)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
765 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
766 register uint32_t head = 0xffffff00;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
767 register uint32_t pat = pattern & 0xffffff00;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
768 int total_len = 0;
17417
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
769 do {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
770 register unsigned char *ds_buf = &ds->buffer[ds->buffer_size];
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
771 int len = ds->buffer_size - ds->buffer_pos;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
772 register long pos = -len;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
773 if (unlikely(pos >= 0)) { // buffer is empty
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
774 ds_fill_buffer(ds);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
775 continue;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
776 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
777 do {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
778 head |= ds_buf[pos];
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
779 head <<= 8;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
780 } while (++pos && head != pat);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
781 len += pos;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
782 if (total_len + len > maxlen)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
783 len = maxlen - total_len;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
784 len = demux_read_data(ds, mem ? &mem[total_len] : NULL, len);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
785 total_len += len;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
786 } while ((head != pat || total_len < 3) && total_len < maxlen && !ds->eof);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
787 if (read)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
788 *read = total_len;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
789 return total_len >= 3 && head == pat;
17417
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
790 }
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
791
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
792 void ds_free_packs(demux_stream_t *ds)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
793 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
794 demux_packet_t *dp = ds->first;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
795 while (dp) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
796 demux_packet_t *dn = dp->next;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
797 free_demux_packet(dp);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
798 dp = dn;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
799 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
800 if (ds->asf_packet) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
801 // free unfinished .asf fragments:
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
802 free(ds->asf_packet->buffer);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
803 free(ds->asf_packet);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
804 ds->asf_packet = NULL;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
805 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
806 ds->first = ds->last = NULL;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
807 ds->packs = 0; // !!!!!
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
808 ds->bytes = 0;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
809 if (ds->current)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
810 free_demux_packet(ds->current);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
811 ds->current = NULL;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
812 ds->buffer = NULL;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
813 ds->buffer_pos = ds->buffer_size;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
814 ds->pts = 0;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
815 ds->pts_bytes = 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
816 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
817
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
818 int ds_get_packet(demux_stream_t *ds, unsigned char **start)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
819 {
24826
ac881f93b661 demuxer.c: Remove useless code
uau
parents: 24678
diff changeset
820 int len;
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
821 if (ds->buffer_pos >= ds->buffer_size) {
27052
79e51c2fdb00 M-x untabify
diego
parents: 27051
diff changeset
822 if (!ds_fill_buffer(ds)) {
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
823 // EOF
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
824 *start = NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
825 return -1;
27052
79e51c2fdb00 M-x untabify
diego
parents: 27051
diff changeset
826 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
827 }
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
828 len = ds->buffer_size - ds->buffer_pos;
24826
ac881f93b661 demuxer.c: Remove useless code
uau
parents: 24678
diff changeset
829 *start = &ds->buffer[ds->buffer_pos];
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
830 ds->buffer_pos += len;
24826
ac881f93b661 demuxer.c: Remove useless code
uau
parents: 24678
diff changeset
831 return len;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
832 }
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
833
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
834 int ds_get_packet_pts(demux_stream_t *ds, unsigned char **start, double *pts)
18242
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
835 {
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
836 int len;
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
837 *pts = MP_NOPTS_VALUE;
29504
940fb22fd9dd Reuse ds_get_packet in ds_get_packet_pts
reimar
parents: 29486
diff changeset
838 len = ds_get_packet(ds, start);
940fb22fd9dd Reuse ds_get_packet in ds_get_packet_pts
reimar
parents: 29486
diff changeset
839 if (len < 0)
940fb22fd9dd Reuse ds_get_packet in ds_get_packet_pts
reimar
parents: 29486
diff changeset
840 return len;
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18900
diff changeset
841 // Return pts unless this read starts from the middle of a packet
29504
940fb22fd9dd Reuse ds_get_packet in ds_get_packet_pts
reimar
parents: 29486
diff changeset
842 if (len == ds->buffer_pos)
27052
79e51c2fdb00 M-x untabify
diego
parents: 27051
diff changeset
843 *pts = ds->current->pts;
18242
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
844 return len;
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
845 }
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
846
31558
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
847 /**
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
848 * Get a subtitle packet. In particular avoid reading the stream.
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
849 * \param pts input: maximum pts value of subtitle packet. NOPTS or NULL for any.
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
850 * output: start/referece pts of subtitle
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
851 * May be NULL.
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
852 * \param endpts output: pts for end of display time. May be NULL.
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
853 * \return -1 if no packet is available
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
854 */
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
855 int ds_get_packet_sub(demux_stream_t *ds, unsigned char **start,
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
856 double *pts, double *endpts)
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
857 {
32337
c1a2c51bed1c Fix ds_get_packet_sub to actually respect the pts-based read-ahead limit.
reimar
parents: 32209
diff changeset
858 double max_pts = MP_NOPTS_VALUE;
24826
ac881f93b661 demuxer.c: Remove useless code
uau
parents: 24678
diff changeset
859 int len;
31558
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
860 *start = NULL;
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
861 // initialize pts
32337
c1a2c51bed1c Fix ds_get_packet_sub to actually respect the pts-based read-ahead limit.
reimar
parents: 32209
diff changeset
862 if (pts) {
c1a2c51bed1c Fix ds_get_packet_sub to actually respect the pts-based read-ahead limit.
reimar
parents: 32209
diff changeset
863 max_pts = *pts;
31558
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
864 *pts = MP_NOPTS_VALUE;
32337
c1a2c51bed1c Fix ds_get_packet_sub to actually respect the pts-based read-ahead limit.
reimar
parents: 32209
diff changeset
865 }
31558
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
866 if (endpts)
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
867 *endpts = MP_NOPTS_VALUE;
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
868 if (ds->buffer_pos >= ds->buffer_size) {
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
869 if (!ds->packs)
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
870 return -1; // no sub
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
871 if (!ds_fill_buffer(ds))
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
872 return -1; // EOF
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
873 }
31558
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
874 // only start of buffer has valid pts
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
875 if (ds->buffer_pos == 0) {
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
876 if (endpts)
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
877 *endpts = ds->current->endpts;
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
878 if (pts) {
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
879 *pts = ds->current->pts;
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
880 // check if we are too early
32337
c1a2c51bed1c Fix ds_get_packet_sub to actually respect the pts-based read-ahead limit.
reimar
parents: 32209
diff changeset
881 if (*pts != MP_NOPTS_VALUE && max_pts != MP_NOPTS_VALUE &&
c1a2c51bed1c Fix ds_get_packet_sub to actually respect the pts-based read-ahead limit.
reimar
parents: 32209
diff changeset
882 *pts > max_pts)
31558
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
883 return -1;
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
884 }
a3a50df246f8 Move the subtitle pts handling code to demuxer.c
reimar
parents: 31418
diff changeset
885 }
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
886 len = ds->buffer_size - ds->buffer_pos;
24826
ac881f93b661 demuxer.c: Remove useless code
uau
parents: 24678
diff changeset
887 *start = &ds->buffer[ds->buffer_pos];
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
888 ds->buffer_pos += len;
24826
ac881f93b661 demuxer.c: Remove useless code
uau
parents: 24678
diff changeset
889 return len;
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
890 }
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
891
18309
87161f96fa66 Change common pts variables from floats to doubles. Individual demuxers
uau
parents: 18242
diff changeset
892 double ds_get_next_pts(demux_stream_t *ds)
87161f96fa66 Change common pts variables from floats to doubles. Individual demuxers
uau
parents: 18242
diff changeset
893 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
894 demuxer_t *demux = ds->demuxer;
31272
e340fa125680 Fix ds_get_next_pts to also work for the first packet of a stream.
reimar
parents: 31250
diff changeset
895 // if we have not read from the "current" packet, consider it
e340fa125680 Fix ds_get_next_pts to also work for the first packet of a stream.
reimar
parents: 31250
diff changeset
896 // as the next, otherwise we never get the pts for the first packet.
e340fa125680 Fix ds_get_next_pts to also work for the first packet of a stream.
reimar
parents: 31250
diff changeset
897 while (!ds->first && (!ds->current || ds->buffer_pos)) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
898 if (demux->audio->packs >= MAX_PACKS
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
899 || demux->audio->bytes >= MAX_PACK_BYTES) {
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
900 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyAudioInBuffer,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
901 demux->audio->packs, demux->audio->bytes);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
902 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
903 return MP_NOPTS_VALUE;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
904 }
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
905 if (demux->video->packs >= MAX_PACKS
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
906 || demux->video->bytes >= MAX_PACK_BYTES) {
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
907 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyVideoInBuffer,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
908 demux->video->packs, demux->video->bytes);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
909 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
910 return MP_NOPTS_VALUE;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
911 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
912 if (!demux_fill_buffer(demux, ds))
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
913 return MP_NOPTS_VALUE;
5930
68cac7ecaf05 Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents: 5897
diff changeset
914 }
31272
e340fa125680 Fix ds_get_next_pts to also work for the first packet of a stream.
reimar
parents: 31250
diff changeset
915 // take pts from "current" if we never read from it.
e340fa125680 Fix ds_get_next_pts to also work for the first packet of a stream.
reimar
parents: 31250
diff changeset
916 if (ds->current && !ds->buffer_pos)
e340fa125680 Fix ds_get_next_pts to also work for the first packet of a stream.
reimar
parents: 31250
diff changeset
917 return ds->current->pts;
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
918 return ds->first->pts;
5930
68cac7ecaf05 Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents: 5897
diff changeset
919 }
68cac7ecaf05 Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents: 5897
diff changeset
920
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
921 // ====================================================================
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
922
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
923 void demuxer_help(void)
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
924 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
925 int i;
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
926
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
927 mp_msg(MSGT_DEMUXER, MSGL_INFO, "Available demuxers:\n");
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
928 mp_msg(MSGT_DEMUXER, MSGL_INFO, " demuxer: type info: (comment)\n");
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
929 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DEMUXERS\n");
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
930 for (i = 0; demuxer_list[i]; i++) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
931 if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Don't display special demuxers
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
932 continue;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
933 if (demuxer_list[i]->comment && strlen(demuxer_list[i]->comment))
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
934 mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %2d %s (%s)\n",
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
935 demuxer_list[i]->name, demuxer_list[i]->type,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
936 demuxer_list[i]->info, demuxer_list[i]->comment);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
937 else
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
938 mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %2d %s\n",
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
939 demuxer_list[i]->name, demuxer_list[i]->type,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
940 demuxer_list[i]->info);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
941 }
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
942 }
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
943
14693
37116118ab6a avisynth demuxer patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents: 14666
diff changeset
944
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
945 /**
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
946 * Get demuxer type for a given demuxer name
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
947 *
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
948 * @param demuxer_name string with demuxer name of demuxer number
16321
efbfac98cab1 Allow forcing of demuxers and codecs by prepending '+'
reimar
parents: 16310
diff changeset
949 * @param force will be set if demuxer should be forced.
efbfac98cab1 Allow forcing of demuxers and codecs by prepending '+'
reimar
parents: 16310
diff changeset
950 * May be NULL.
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
951 * @return DEMUXER_TYPE_xxx, -1 if error or not found
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
952 */
16321
efbfac98cab1 Allow forcing of demuxers and codecs by prepending '+'
reimar
parents: 16310
diff changeset
953 int get_demuxer_type_from_name(char *demuxer_name, int *force)
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
954 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
955 int i;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
956 long type_int;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
957 char *endptr;
5133
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 5107
diff changeset
958
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
959 if (!demuxer_name || !demuxer_name[0])
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
960 return DEMUXER_TYPE_UNKNOWN;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
961 if (force)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
962 *force = demuxer_name[0] == '+';
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
963 if (demuxer_name[0] == '+')
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
964 demuxer_name = &demuxer_name[1];
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
965 for (i = 0; demuxer_list[i]; i++) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
966 if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Can't select special demuxers from commandline
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
967 continue;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
968 if (strcmp(demuxer_name, demuxer_list[i]->name) == 0)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
969 return demuxer_list[i]->type;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
970 }
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
971
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
972 // No match found, try to parse name as an integer (demuxer number)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
973 type_int = strtol(demuxer_name, &endptr, 0);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
974 if (*endptr) // Conversion failed
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
975 return -1;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
976 if ((type_int > 0) && (type_int <= DEMUXER_TYPE_MAX))
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
977 return (int) type_int;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
978
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
979 return -1;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
980 }
3801
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
981
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
982 int extension_parsing = 1; // 0=off 1=mixed (used only for unstable formats)
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents: 6192
diff changeset
983
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
984 int correct_pts = 0;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
985 int user_correct_pts = -1;
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18900
diff changeset
986
9751
00c97b0891e3 Fix all demuxers wich where using a global var to enable themself.
albeu
parents: 9709
diff changeset
987 /*
00c97b0891e3 Fix all demuxers wich where using a global var to enable themself.
albeu
parents: 9709
diff changeset
988 NOTE : Several demuxers may be opened at the same time so
00c97b0891e3 Fix all demuxers wich where using a global var to enable themself.
albeu
parents: 9709
diff changeset
989 demuxers should NEVER rely on an external var to enable them
25197
eb2c5925ec34 Fix typos in comments to stop them hurting my eyes
reimar
parents: 24826
diff changeset
990 self. If a demuxer can't do any auto-detection it should only use
eb2c5925ec34 Fix typos in comments to stop them hurting my eyes
reimar
parents: 24826
diff changeset
991 file_format. The user can explicitly set file_format with the -demuxer
9751
00c97b0891e3 Fix all demuxers wich where using a global var to enable themself.
albeu
parents: 9709
diff changeset
992 option so there is really no need for another extra var.
25197
eb2c5925ec34 Fix typos in comments to stop them hurting my eyes
reimar
parents: 24826
diff changeset
993 For convenience an option can be added to set file_format directly
9751
00c97b0891e3 Fix all demuxers wich where using a global var to enable themself.
albeu
parents: 9709
diff changeset
994 to the right type (ex: rawaudio,rawvideo).
25197
eb2c5925ec34 Fix typos in comments to stop them hurting my eyes
reimar
parents: 24826
diff changeset
995 Also the stream can override the file_format so a demuxer which rely
9751
00c97b0891e3 Fix all demuxers wich where using a global var to enable themself.
albeu
parents: 9709
diff changeset
996 on a special stream type can set file_format at the stream level
00c97b0891e3 Fix all demuxers wich where using a global var to enable themself.
albeu
parents: 9709
diff changeset
997 (ex: tv,mf).
00c97b0891e3 Fix all demuxers wich where using a global var to enable themself.
albeu
parents: 9709
diff changeset
998 */
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
999
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
1000 static demuxer_t *demux_open_stream(stream_t *stream, int file_format,
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1001 int force, int audio_id, int video_id,
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1002 int dvdsub_id, char *filename)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1003 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1004 demuxer_t *demuxer = NULL;
1659
6b71bbf515e4 num_elementary_packets1xx reset
arpi
parents: 1657
diff changeset
1005
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1006 sh_video_t *sh_video = NULL;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1007
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1008 const demuxer_desc_t *demuxer_desc;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1009 int fformat = 0;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1010 int i;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1011
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1012 // If somebody requested a demuxer check it
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1013 if (file_format) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1014 if ((demuxer_desc = get_demuxer_desc_from_type(file_format))) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1015 demuxer = new_demuxer(stream, demuxer_desc->type, audio_id,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1016 video_id, dvdsub_id, filename);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1017 if (demuxer_desc->check_file)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1018 fformat = demuxer_desc->check_file(demuxer);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1019 if (force || !demuxer_desc->check_file)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1020 fformat = demuxer_desc->type;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1021 if (fformat != 0) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1022 if (fformat == demuxer_desc->type) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1023 demuxer_t *demux2 = demuxer;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1024 // Move messages to demuxer detection code?
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1025 mp_msg(MSGT_DEMUXER, MSGL_INFO,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1026 MSGTR_Detected_XXX_FileFormat,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1027 demuxer_desc->shortdesc);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1028 file_format = fformat;
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1029 if (!demuxer->desc->open
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1030 || (demux2 = demuxer->desc->open(demuxer))) {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1031 demuxer = demux2;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1032 goto dmx_open;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1033 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1034 } else {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1035 // Format changed after check, recurse
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1036 free_demuxer(demuxer);
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1037 return demux_open_stream(stream, fformat, force, audio_id,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1038 video_id, dvdsub_id, filename);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1039 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1040 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1041 // Check failed for forced demuxer, quit
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1042 free_demuxer(demuxer);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1043 return NULL;
20303
21dd6cf54fff Try other demuxers if open() fails.
reimar
parents: 20072
diff changeset
1044 }
21dd6cf54fff Try other demuxers if open() fails.
reimar
parents: 20072
diff changeset
1045 }
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1046 // Test demuxers with safe file checks
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1047 for (i = 0; (demuxer_desc = demuxer_list[i]); i++) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1048 if (demuxer_desc->safe_check) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1049 demuxer = new_demuxer(stream, demuxer_desc->type, audio_id,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1050 video_id, dvdsub_id, filename);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1051 if ((fformat = demuxer_desc->check_file(demuxer)) != 0) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1052 if (fformat == demuxer_desc->type) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1053 demuxer_t *demux2 = demuxer;
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1054 mp_msg(MSGT_DEMUXER, MSGL_INFO,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1055 MSGTR_Detected_XXX_FileFormat,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1056 demuxer_desc->shortdesc);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1057 file_format = fformat;
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1058 if (!demuxer->desc->open
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1059 || (demux2 = demuxer->desc->open(demuxer))) {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1060 demuxer = demux2;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1061 goto dmx_open;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1062 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1063 } else {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1064 if (fformat == DEMUXER_TYPE_PLAYLIST)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1065 return demuxer; // handled in mplayer.c
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1066 // Format changed after check, recurse
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1067 free_demuxer(demuxer);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1068 demuxer = demux_open_stream(stream, fformat, force,
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1069 audio_id, video_id,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1070 dvdsub_id, filename);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1071 if (demuxer)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1072 return demuxer; // done!
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1073 file_format = DEMUXER_TYPE_UNKNOWN;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1074 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1075 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1076 free_demuxer(demuxer);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1077 demuxer = NULL;
26379
fa8997230d4e Reformat demuxer.c
uau
parents: 26378
diff changeset
1078 }
fa8997230d4e Reformat demuxer.c
uau
parents: 26378
diff changeset
1079 }
9006
d00997f12257 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents: 8937
diff changeset
1080
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1081 // If no forced demuxer perform file extension based detection
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1082 // Ok. We're over the stable detectable fileformats, the next ones are
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1083 // a bit fuzzy. So by default (extension_parsing==1) try extension-based
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1084 // detection first:
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1085 if (file_format == DEMUXER_TYPE_UNKNOWN && filename
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1086 && extension_parsing == 1) {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1087 file_format = demuxer_type_by_filename(filename);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1088 if (file_format != DEMUXER_TYPE_UNKNOWN) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1089 // we like recursion :)
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1090 demuxer = demux_open_stream(stream, file_format, force, audio_id,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1091 video_id, dvdsub_id, filename);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1092 if (demuxer)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1093 return demuxer; // done!
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1094 file_format = DEMUXER_TYPE_UNKNOWN; // continue fuzzy guessing...
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1095 mp_msg(MSGT_DEMUXER, MSGL_V,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1096 "demuxer: continue fuzzy content-based format guessing...\n");
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1097 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1098 }
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1099 // Try detection for all other demuxers
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1100 for (i = 0; (demuxer_desc = demuxer_list[i]); i++) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1101 if (!demuxer_desc->safe_check && demuxer_desc->check_file) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1102 demuxer = new_demuxer(stream, demuxer_desc->type, audio_id,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1103 video_id, dvdsub_id, filename);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1104 if ((fformat = demuxer_desc->check_file(demuxer)) != 0) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1105 if (fformat == demuxer_desc->type) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1106 demuxer_t *demux2 = demuxer;
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1107 mp_msg(MSGT_DEMUXER, MSGL_INFO,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1108 MSGTR_Detected_XXX_FileFormat,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1109 demuxer_desc->shortdesc);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1110 file_format = fformat;
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1111 if (!demuxer->desc->open
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1112 || (demux2 = demuxer->desc->open(demuxer))) {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1113 demuxer = demux2;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1114 goto dmx_open;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1115 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1116 } else {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1117 if (fformat == DEMUXER_TYPE_PLAYLIST)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1118 return demuxer; // handled in mplayer.c
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1119 // Format changed after check, recurse
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1120 free_demuxer(demuxer);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1121 demuxer = demux_open_stream(stream, fformat, force,
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1122 audio_id, video_id,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1123 dvdsub_id, filename);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1124 if (demuxer)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1125 return demuxer; // done!
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1126 file_format = DEMUXER_TYPE_UNKNOWN;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1127 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1128 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1129 free_demuxer(demuxer);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1130 demuxer = NULL;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1131 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1132 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1133
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1134 return NULL;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1135 //====== File format recognized, set up these for compatibility: =========
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1136 dmx_open:
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1137
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1138 demuxer->file_format = file_format;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1139
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1140 if ((sh_video = demuxer->video->sh) && sh_video->bih) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1141 int biComp = le2me_32(sh_video->bih->biCompression);
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1142 mp_msg(MSGT_DEMUX, MSGL_INFO,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1143 "VIDEO: [%.4s] %dx%d %dbpp %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n",
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1144 (char *) &biComp, sh_video->bih->biWidth,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1145 sh_video->bih->biHeight, sh_video->bih->biBitCount,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1146 sh_video->fps, sh_video->i_bps * 0.008f,
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1147 sh_video->i_bps / 1024.0f);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1148 }
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27282
diff changeset
1149 #ifdef CONFIG_ASS
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1150 if (ass_enabled && ass_library) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1151 for (i = 0; i < MAX_S_STREAMS; ++i) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1152 sh_sub_t *sh = demuxer->s_streams[i];
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1153 if (sh && sh->type == 'a') {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1154 sh->ass_track = ass_new_track(ass_library);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1155 if (sh->ass_track && sh->extradata)
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1156 ass_process_codec_private(sh->ass_track, sh->extradata,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1157 sh->extradata_len);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1158 } else if (sh && sh->type != 'v')
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1159 sh->ass_track = ass_default_track(ass_library);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1160 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1161 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1162 #endif
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1163 return demuxer;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1164 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1165
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
1166 char *audio_stream = NULL;
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1167 char *sub_stream = NULL;
9709
1b1e33d1688a Fix rawvideo and -audiofile
albeu
parents: 9610
diff changeset
1168 int audio_stream_cache = 0;
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7754
diff changeset
1169
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1170 char *demuxer_name = NULL; // parameter from -demuxer
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
1171 char *audio_demuxer_name = NULL; // parameter from -audio-demuxer
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1172 char *sub_demuxer_name = NULL; // parameter from -sub-demuxer
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
1173
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1174 demuxer_t *demux_open(stream_t *vs, int file_format, int audio_id,
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1175 int video_id, int dvdsub_id, char *filename)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1176 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1177 stream_t *as = NULL, *ss = NULL;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1178 demuxer_t *vd, *ad = NULL, *sd = NULL;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1179 demuxer_t *res;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1180 int afmt = DEMUXER_TYPE_UNKNOWN, sfmt = DEMUXER_TYPE_UNKNOWN;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1181 int demuxer_type;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1182 int audio_demuxer_type = 0, sub_demuxer_type = 0;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1183 int demuxer_force = 0, audio_demuxer_force = 0, sub_demuxer_force = 0;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
1184
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1185 if ((demuxer_type =
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1186 get_demuxer_type_from_name(demuxer_name, &demuxer_force)) < 0) {
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1187 mp_msg(MSGT_DEMUXER, MSGL_ERR, "-demuxer %s does not exist.\n",
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1188 demuxer_name);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1189 }
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1190 if ((audio_demuxer_type =
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1191 get_demuxer_type_from_name(audio_demuxer_name,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1192 &audio_demuxer_force)) < 0) {
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1193 mp_msg(MSGT_DEMUXER, MSGL_ERR, "-audio-demuxer %s does not exist.\n",
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1194 audio_demuxer_name);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1195 }
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1196 if ((sub_demuxer_type =
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1197 get_demuxer_type_from_name(sub_demuxer_name,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1198 &sub_demuxer_force)) < 0) {
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1199 mp_msg(MSGT_DEMUXER, MSGL_ERR, "-sub-demuxer %s does not exist.\n",
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1200 sub_demuxer_name);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1201 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1202
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1203 if (audio_stream) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1204 as = open_stream(audio_stream, 0, &afmt);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1205 if (!as) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1206 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_CannotOpenAudioStream,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1207 audio_stream);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1208 return NULL;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1209 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1210 if (audio_stream_cache) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1211 if (!stream_enable_cache
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1212 (as, audio_stream_cache * 1024,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1213 audio_stream_cache * 1024 * (stream_cache_min_percent /
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1214 100.0),
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1215 audio_stream_cache * 1024 * (stream_cache_seek_min_percent /
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1216 100.0))) {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1217 free_stream(as);
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1218 mp_msg(MSGT_DEMUXER, MSGL_ERR,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1219 "Can't enable audio stream cache\n");
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1220 return NULL;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1221 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1222 }
26379
fa8997230d4e Reformat demuxer.c
uau
parents: 26378
diff changeset
1223 }
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1224 if (sub_stream) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1225 ss = open_stream(sub_stream, 0, &sfmt);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1226 if (!ss) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1227 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_CannotOpenSubtitlesStream,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1228 sub_stream);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1229 return NULL;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1230 }
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
1231 }
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
1232
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1233 vd = demux_open_stream(vs, demuxer_type ? demuxer_type : file_format,
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1234 demuxer_force, audio_stream ? -2 : audio_id,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1235 video_id, sub_stream ? -2 : dvdsub_id, filename);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1236 if (!vd) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1237 if (as)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1238 free_stream(as);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1239 if (ss)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1240 free_stream(ss);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1241 return NULL;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1242 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1243 if (as) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1244 ad = demux_open_stream(as,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1245 audio_demuxer_type ? audio_demuxer_type : afmt,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1246 audio_demuxer_force, audio_id, -2, -2,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1247 audio_stream);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1248 if (!ad) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1249 mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_OpeningAudioDemuxerFailed,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1250 audio_stream);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1251 free_stream(as);
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1252 } else if (ad->audio->sh
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1253 && ((sh_audio_t *) ad->audio->sh)->format == 0x55) // MP3
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1254 hr_mp3_seek = 1; // Enable high res seeking
9709
1b1e33d1688a Fix rawvideo and -audiofile
albeu
parents: 9610
diff changeset
1255 }
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1256 if (ss) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1257 sd = demux_open_stream(ss, sub_demuxer_type ? sub_demuxer_type : sfmt,
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1258 sub_demuxer_force, -2, -2, dvdsub_id,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1259 sub_stream);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1260 if (!sd) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1261 mp_msg(MSGT_DEMUXER, MSGL_WARN,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1262 MSGTR_OpeningSubtitlesDemuxerFailed, sub_stream);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1263 free_stream(ss);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1264 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1265 }
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
1266
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1267 if (ad && sd)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1268 res = new_demuxers_demuxer(vd, ad, sd);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1269 else if (ad)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1270 res = new_demuxers_demuxer(vd, ad, vd);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1271 else if (sd)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1272 res = new_demuxers_demuxer(vd, vd, sd);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1273 else
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1274 res = vd;
25919
382672c7480a Allow demuxers to choose a default value for correct_pts
reimar
parents: 25883
diff changeset
1275
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1276 correct_pts = user_correct_pts;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1277 if (correct_pts < 0)
31250
a7c91e121d79 Default to -correct-pts off if -fps was given, since -fps has no effect
reimar
parents: 30702
diff changeset
1278 correct_pts = !force_fps && demux_control(res, DEMUXER_CTRL_CORRECT_PTS, NULL)
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1279 == DEMUXER_CTRL_OK;
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1280 return res;
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
1281 }
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
1282
30396
5fe2615e5db7 Remove ds_fill_buffer calls from demux_resync, they cause issues at least with
reimar
parents: 30385
diff changeset
1283 /**
5fe2615e5db7 Remove ds_fill_buffer calls from demux_resync, they cause issues at least with
reimar
parents: 30385
diff changeset
1284 * Do necessary reinitialization after e.g. a seek.
5fe2615e5db7 Remove ds_fill_buffer calls from demux_resync, they cause issues at least with
reimar
parents: 30385
diff changeset
1285 * Do _not_ call ds_fill_buffer between the seek and this, it breaks at least
5fe2615e5db7 Remove ds_fill_buffer calls from demux_resync, they cause issues at least with
reimar
parents: 30385
diff changeset
1286 * seeking with ASF demuxer.
5fe2615e5db7 Remove ds_fill_buffer calls from demux_resync, they cause issues at least with
reimar
parents: 30385
diff changeset
1287 */
30378
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1288 static void demux_resync(demuxer_t *demuxer)
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1289 {
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1290 sh_video_t *sh_video = demuxer->video->sh;
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1291 sh_audio_t *sh_audio = demuxer->audio->sh;
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1292 demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL);
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1293 if (sh_video) {
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1294 resync_video_stream(sh_video);
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1295 }
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1296 if (sh_audio) {
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1297 resync_audio_stream(sh_audio);
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1298 }
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1299 }
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
1300
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1301 void demux_flush(demuxer_t *demuxer)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1302 {
30379
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
1303 #if PARSE_ON_ADD
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
1304 ds_clear_parser(demuxer->video);
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
1305 ds_clear_parser(demuxer->audio);
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
1306 ds_clear_parser(demuxer->sub);
0140d505dd91 Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
reimar
parents: 30378
diff changeset
1307 #endif
26926
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
1308 ds_free_packs(demuxer->video);
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
1309 ds_free_packs(demuxer->audio);
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
1310 ds_free_packs(demuxer->sub);
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
1311 }
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
1312
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1313 int demux_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay,
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1314 int flags)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1315 {
20851
6602a90a06ec consistency fix: STREAM_CTRL_GET_TIME_LENGTH and STREAM_CTRL_GET_CURRENT_TIME now return time in (double) seconds
nicodvb
parents: 20841
diff changeset
1316 double tmp = 0;
20748
865b71a83296 now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents: 20319
diff changeset
1317 double pts;
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
1318
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1319 if (!demuxer->seekable) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1320 if (demuxer->file_format == DEMUXER_TYPE_AVI)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1321 mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_CantSeekRawAVI);
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27282
diff changeset
1322 #ifdef CONFIG_TV
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1323 else if (demuxer->file_format == DEMUXER_TYPE_TV)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1324 mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_TVInputNotSeekable);
2790
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
1325 #endif
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1326 else
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1327 mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_CantSeekFile);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1328 return 0;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1329 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1330
26926
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
1331 demux_flush(demuxer);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1332
27045
66cda68db746 Remove pointless comments and commented-out code.
diego
parents: 26926
diff changeset
1333 demuxer->stream->eof = 0;
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1334 demuxer->video->eof = 0;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1335 demuxer->audio->eof = 0;
31949
fc0217dee42c Also reset subtitle EOF on seeking.
reimar
parents: 31925
diff changeset
1336 demuxer->sub->eof = 0;
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
1337
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1338 if (flags & SEEK_ABSOLUTE)
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1339 pts = 0.0f;
20748
865b71a83296 now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents: 20319
diff changeset
1340 else {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1341 if (demuxer->stream_pts == MP_NOPTS_VALUE)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1342 goto dmx_seek;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1343 pts = demuxer->stream_pts;
20748
865b71a83296 now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents: 20319
diff changeset
1344 }
865b71a83296 now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents: 20319
diff changeset
1345
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1346 if (flags & SEEK_FACTOR) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1347 if (stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, &tmp)
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1348 == STREAM_UNSUPPORTED)
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1349 goto dmx_seek;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1350 pts += tmp * rel_seek_secs;
20748
865b71a83296 now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents: 20319
diff changeset
1351 } else
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1352 pts += rel_seek_secs;
20748
865b71a83296 now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents: 20319
diff changeset
1353
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1354 if (stream_control(demuxer->stream, STREAM_CTRL_SEEK_TO_TIME, &pts) !=
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1355 STREAM_UNSUPPORTED) {
30378
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1356 demux_resync(demuxer);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1357 return 1;
20748
865b71a83296 now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents: 20319
diff changeset
1358 }
865b71a83296 now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents: 20319
diff changeset
1359
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1360 dmx_seek:
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1361 if (demuxer->desc->seek)
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1362 demuxer->desc->seek(demuxer, rel_seek_secs, audio_delay, flags);
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
1363
30378
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1364 demux_resync(demuxer);
16877
9081ae3a702c move resync_audio_stream after seeking to demuxer.c
reimar
parents: 16572
diff changeset
1365
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1366 return 1;
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
1367 }
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
1368
19053
75327b24e06f marks several string parameters as const, as they are not modified inside the function, Patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents: 18917
diff changeset
1369 int demux_info_add(demuxer_t *demuxer, const char *opt, const char *param)
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1370 {
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4660
diff changeset
1371 char **info = demuxer->info;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4660
diff changeset
1372 int n = 0;
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
1373
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1374
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1375 for (n = 0; info && info[2 * n] != NULL; n++) {
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1376 if (!strcasecmp(opt, info[2 * n])) {
29634
342a78c13eeb Reduce verbosity if demuxer sets an info value to the same as the current value.
reimar
parents: 29504
diff changeset
1377 if (!strcmp(param, info[2 * n + 1])) {
342a78c13eeb Reduce verbosity if demuxer sets an info value to the same as the current value.
reimar
parents: 29504
diff changeset
1378 mp_msg(MSGT_DEMUX, MSGL_V, "Demuxer info %s set to unchanged value %s\n", opt, param);
342a78c13eeb Reduce verbosity if demuxer sets an info value to the same as the current value.
reimar
parents: 29504
diff changeset
1379 return 0;
342a78c13eeb Reduce verbosity if demuxer sets an info value to the same as the current value.
reimar
parents: 29504
diff changeset
1380 }
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1381 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_DemuxerInfoChanged, opt,
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1382 param);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1383 free(info[2 * n + 1]);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1384 info[2 * n + 1] = strdup(param);
27052
79e51c2fdb00 M-x untabify
diego
parents: 27051
diff changeset
1385 return 0;
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1386 }
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1387 }
27051
414d5a794c35 cosmetics: Remove all trailing whitespace.
diego
parents: 27050
diff changeset
1388
30702
9fc9d1e788aa Do not cast the results of malloc/calloc/realloc.
diego
parents: 30644
diff changeset
1389 info = demuxer->info = realloc(info, (2 * (n + 2)) * sizeof(char *));
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1390 info[2 * n] = strdup(opt);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1391 info[2 * n + 1] = strdup(param);
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1392 memset(&info[2 * (n + 1)], 0, 2 * sizeof(char *));
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1393
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4660
diff changeset
1394 return 1;
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1395 }
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1396
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1397 int demux_info_print(demuxer_t *demuxer)
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1398 {
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4660
diff changeset
1399 char **info = demuxer->info;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4660
diff changeset
1400 int n;
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1401
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1402 if (!info)
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1403 return 0;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4660
diff changeset
1404
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1405 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_ClipInfo);
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1406 for (n = 0; info[2 * n] != NULL; n++) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1407 mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n", info[2 * n],
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1408 info[2 * n + 1]);
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1409 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_NAME%d=%s\n", n,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1410 info[2 * n]);
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1411 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_VALUE%d=%s\n", n,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1412 info[2 * n + 1]);
15789
32d9c8a0a02b adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
gpoirier
parents: 15780
diff changeset
1413 }
18237
4231482179b6 Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
reynaldo
parents: 18128
diff changeset
1414 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_N=%d\n", n);
4189
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
1415
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
1416 return 0;
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1417 }
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
1418
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1419 char *demux_info_get(demuxer_t *demuxer, const char *opt)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1420 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1421 int i;
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1422 char **info = demuxer->info;
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
1423
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1424 for (i = 0; info && info[2 * i] != NULL; i++) {
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1425 if (!strcasecmp(opt, info[2 * i]))
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1426 return info[2 * i + 1];
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1427 }
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
1428
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1429 return NULL;
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
1430 }
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
1431
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1432 int demux_control(demuxer_t *demuxer, int cmd, void *arg)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1433 {
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1434
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
1435 if (demuxer->desc->control)
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1436 return demuxer->desc->control(demuxer, cmd, arg);
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
1437
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
1438 return DEMUXER_CTRL_NOTIMPL;
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1439 }
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1440
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1441
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1442
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1443 double demuxer_get_time_length(demuxer_t *demuxer)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1444 {
16346
6ff303d2876b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents: 16326
diff changeset
1445 double get_time_ans;
14502
8769fa370f83 Move generic length and percent pos calculation to demuxer.c
reimar
parents: 14276
diff changeset
1446 sh_video_t *sh_video = demuxer->video->sh;
16925
4bce034eeb0a estimate total time also for audio-only files.
reimar
parents: 16877
diff changeset
1447 sh_audio_t *sh_audio = demuxer->audio->sh;
14502
8769fa370f83 Move generic length and percent pos calculation to demuxer.c
reimar
parents: 14276
diff changeset
1448 // <= 0 means DEMUXER_CTRL_NOTIMPL or DEMUXER_CTRL_DONTKNOW
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1449 if (demux_control
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1450 (demuxer, DEMUXER_CTRL_GET_TIME_LENGTH, (void *) &get_time_ans) <= 0) {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1451 if (sh_video && sh_video->i_bps && sh_audio && sh_audio->i_bps)
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1452 get_time_ans = (double) (demuxer->movi_end -
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1453 demuxer->movi_start) / (sh_video->i_bps +
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1454 sh_audio->i_bps);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1455 else if (sh_video && sh_video->i_bps)
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1456 get_time_ans = (double) (demuxer->movi_end -
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1457 demuxer->movi_start) / sh_video->i_bps;
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1458 else if (sh_audio && sh_audio->i_bps)
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1459 get_time_ans = (double) (demuxer->movi_end -
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1460 demuxer->movi_start) / sh_audio->i_bps;
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1461 else
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1462 get_time_ans = 0;
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1463 }
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1464 return get_time_ans;
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1465 }
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1466
20749
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1467 /**
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1468 * \brief demuxer_get_current_time() returns the time of the current play in three possible ways:
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1469 * either when the stream reader satisfies STREAM_CTRL_GET_CURRENT_TIME (e.g. dvd)
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1470 * or using sh_video->pts when the former method fails
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1471 * 0 otherwise
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1472 * \return the current play time
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1473 */
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1474 int demuxer_get_current_time(demuxer_t *demuxer)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1475 {
20749
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1476 double get_time_ans = 0;
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1477 sh_video_t *sh_video = demuxer->video->sh;
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1478 if (demuxer->stream_pts != MP_NOPTS_VALUE)
21782
99ab6c41eb1e use demuxer->stream_pts rather than stream_control(STREAM_CTRL_GET_CURRENT_TIME)
nicodvb
parents: 21780
diff changeset
1479 get_time_ans = demuxer->stream_pts;
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1480 else if (sh_video)
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1481 get_time_ans = sh_video->pts;
20749
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1482 return (int) get_time_ans;
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1483 }
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1484
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1485 int demuxer_get_percent_pos(demuxer_t *demuxer)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1486 {
14197
2ae224195625 Use demuxer_get_percent_pos for the OSD position bar
reimar
parents: 14160
diff changeset
1487 int ans = 0;
2ae224195625 Use demuxer_get_percent_pos for the OSD position bar
reimar
parents: 14160
diff changeset
1488 int res = demux_control(demuxer, DEMUXER_CTRL_GET_PERCENT_POS, &ans);
2ae224195625 Use demuxer_get_percent_pos for the OSD position bar
reimar
parents: 14160
diff changeset
1489 int len = (demuxer->movi_end - demuxer->movi_start) / 100;
14502
8769fa370f83 Move generic length and percent pos calculation to demuxer.c
reimar
parents: 14276
diff changeset
1490 if (res <= 0) {
29486
a373af1e3b24 Handle demuxers that never set filepos by using stream_tell.
reimar
parents: 29366
diff changeset
1491 off_t pos = demuxer->filepos > 0 ? demuxer->filepos : stream_tell(demuxer->stream);
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1492 if (len > 0)
29486
a373af1e3b24 Handle demuxers that never set filepos by using stream_tell.
reimar
parents: 29366
diff changeset
1493 ans = (pos - demuxer->movi_start) / len;
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1494 else
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1495 ans = 0;
14502
8769fa370f83 Move generic length and percent pos calculation to demuxer.c
reimar
parents: 14276
diff changeset
1496 }
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1497 if (ans < 0)
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1498 ans = 0;
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1499 if (ans > 100)
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1500 ans = 100;
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1501 return ans;
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1502 }
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1503
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1504 int demuxer_switch_audio(demuxer_t *demuxer, int index)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1505 {
15285
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
1506 int res = demux_control(demuxer, DEMUXER_CTRL_SWITCH_AUDIO, &index);
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
1507 if (res == DEMUXER_CTRL_NOTIMPL)
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1508 index = demuxer->audio->id;
26089
e2f35d90ad39 Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents: 26088
diff changeset
1509 if (demuxer->audio->id >= 0)
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1510 demuxer->audio->sh = demuxer->a_streams[demuxer->audio->id];
26089
e2f35d90ad39 Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents: 26088
diff changeset
1511 else
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1512 demuxer->audio->sh = NULL;
15285
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
1513 return index;
15046
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14934
diff changeset
1514 }
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1515
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1516 int demuxer_switch_video(demuxer_t *demuxer, int index)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1517 {
20948
7c91b80cabc1 added code to switch video stream
nicodvb
parents: 20872
diff changeset
1518 int res = demux_control(demuxer, DEMUXER_CTRL_SWITCH_VIDEO, &index);
7c91b80cabc1 added code to switch video stream
nicodvb
parents: 20872
diff changeset
1519 if (res == DEMUXER_CTRL_NOTIMPL)
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1520 index = demuxer->video->id;
26089
e2f35d90ad39 Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents: 26088
diff changeset
1521 if (demuxer->video->id >= 0)
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1522 demuxer->video->sh = demuxer->v_streams[demuxer->video->id];
26089
e2f35d90ad39 Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents: 26088
diff changeset
1523 else
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1524 demuxer->video->sh = NULL;
20948
7c91b80cabc1 added code to switch video stream
nicodvb
parents: 20872
diff changeset
1525 return index;
7c91b80cabc1 added code to switch video stream
nicodvb
parents: 20872
diff changeset
1526 }
7c91b80cabc1 added code to switch video stream
nicodvb
parents: 20872
diff changeset
1527
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
1528 int demuxer_add_attachment(demuxer_t *demuxer, const char *name,
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
1529 const char *type, const void *data, size_t size)
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1530 {
25657
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1531 if (!(demuxer->num_attachments & 31))
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1532 demuxer->attachments = realloc(demuxer->attachments,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1533 (demuxer->num_attachments + 32) * sizeof(demux_attachment_t));
25657
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1534
33189
e137435bb751 Attempt to support attachements without filename.
reimar
parents: 32940
diff changeset
1535 demuxer->attachments[demuxer->num_attachments].name = name ? strdup(name) : NULL;
25657
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1536 demuxer->attachments[demuxer->num_attachments].type = strdup(type);
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1537 demuxer->attachments[demuxer->num_attachments].data = malloc(size);
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1538 memcpy(demuxer->attachments[demuxer->num_attachments].data, data, size);
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1539 demuxer->attachments[demuxer->num_attachments].data_size = size;
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1540
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1541 return demuxer->num_attachments++;
25657
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1542 }
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1543
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1544 int demuxer_add_chapter(demuxer_t *demuxer, const char *name, uint64_t start,
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1545 uint64_t end)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1546 {
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1547 if (demuxer->chapters == NULL)
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1548 demuxer->chapters = malloc(32 * sizeof(*demuxer->chapters));
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1549 else if (!(demuxer->num_chapters % 32))
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1550 demuxer->chapters = realloc(demuxer->chapters,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1551 (demuxer->num_chapters + 32) *
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1552 sizeof(*demuxer->chapters));
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1553
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1554 demuxer->chapters[demuxer->num_chapters].start = start;
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1555 demuxer->chapters[demuxer->num_chapters].end = end;
27057
42332b47d6aa Support NULL name parameter for demuxer_add_chapter.
reimar
parents: 27056
diff changeset
1556 demuxer->chapters[demuxer->num_chapters].name = strdup(name ? name : MSGTR_Unknown);
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1557
29366
fa9ca1188c50 Print information about chapters with -identify.
reimar
parents: 29238
diff changeset
1558 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_ID=%d\n", demuxer->num_chapters);
fa9ca1188c50 Print information about chapters with -identify.
reimar
parents: 29238
diff changeset
1559 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_%d_START=%"PRIu64"\n", demuxer->num_chapters, start);
fa9ca1188c50 Print information about chapters with -identify.
reimar
parents: 29238
diff changeset
1560 if (end)
fa9ca1188c50 Print information about chapters with -identify.
reimar
parents: 29238
diff changeset
1561 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_%d_END=%"PRIu64"\n", demuxer->num_chapters, end);
fa9ca1188c50 Print information about chapters with -identify.
reimar
parents: 29238
diff changeset
1562 if (name)
fa9ca1188c50 Print information about chapters with -identify.
reimar
parents: 29238
diff changeset
1563 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_%d_NAME=%s\n", demuxer->num_chapters, name);
fa9ca1188c50 Print information about chapters with -identify.
reimar
parents: 29238
diff changeset
1564
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1565 return demuxer->num_chapters++;
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1566 }
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1567
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1568 /**
27051
414d5a794c35 cosmetics: Remove all trailing whitespace.
diego
parents: 27050
diff changeset
1569 * \brief demuxer_seek_chapter() seeks to a chapter in two possible ways:
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1570 * either using the demuxer->chapters structure set by the demuxer
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1571 * or asking help to the stream layer (e.g. dvd)
19439
28d2d1fddff4 clarification in a comment
nicodvb
parents: 19438
diff changeset
1572 * \param chapter - chapter number wished - 0-based
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1573 * \param mode 0: relative to current main pts, 1: absolute
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1574 * \param seek_pts set by the function to the pts to seek to (if demuxer->chapters is set)
19478
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1575 * \param num_chapters number of chapters present (set by this function is param is not null)
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1576 * \param chapter_name name of chapter found (set by this function is param is not null)
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1577 * \return -1 on error, current chapter if successful
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1578 */
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1579
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1580 int demuxer_seek_chapter(demuxer_t *demuxer, int chapter, int mode,
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1581 float *seek_pts, int *num_chapters,
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1582 char **chapter_name)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1583 {
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1584 int ris;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1585 int current, total;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1586
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1587 if (!demuxer->num_chapters || !demuxer->chapters) {
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1588 if (!mode) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1589 ris = stream_control(demuxer->stream,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1590 STREAM_CTRL_GET_CURRENT_CHAPTER, &current);
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1591 if (ris == STREAM_UNSUPPORTED)
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1592 return -1;
19438
263e95c47aec support relative seeking in the stream-driven case
nicodvb
parents: 19435
diff changeset
1593 chapter += current;
263e95c47aec support relative seeking in the stream-driven case
nicodvb
parents: 19435
diff changeset
1594 }
263e95c47aec support relative seeking in the stream-driven case
nicodvb
parents: 19435
diff changeset
1595
26926
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
1596 demux_flush(demuxer);
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1597
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1598 ris = stream_control(demuxer->stream, STREAM_CTRL_SEEK_TO_CHAPTER,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1599 &chapter);
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1600
30378
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1601 demux_resync(demuxer);
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1602
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1603 // exit status may be ok, but main() doesn't have to seek itself
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1604 // (because e.g. dvds depend on sectors, not on pts)
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1605 *seek_pts = -1.0;
19478
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1606
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1607 if (num_chapters) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1608 if (stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS,
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1609 num_chapters) == STREAM_UNSUPPORTED)
19478
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1610 *num_chapters = 0;
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1611 }
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1612
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1613 if (chapter_name) {
19478
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1614 *chapter_name = NULL;
25314
02e2e7a5599a Fix memory leak that tmp allocated but maybe not used.
ulion
parents: 25266
diff changeset
1615 if (num_chapters && *num_chapters) {
02e2e7a5599a Fix memory leak that tmp allocated but maybe not used.
ulion
parents: 25266
diff changeset
1616 char *tmp = malloc(16);
02e2e7a5599a Fix memory leak that tmp allocated but maybe not used.
ulion
parents: 25266
diff changeset
1617 if (tmp) {
02e2e7a5599a Fix memory leak that tmp allocated but maybe not used.
ulion
parents: 25266
diff changeset
1618 sprintf(tmp, " of %3d", *num_chapters);
02e2e7a5599a Fix memory leak that tmp allocated but maybe not used.
ulion
parents: 25266
diff changeset
1619 *chapter_name = tmp;
02e2e7a5599a Fix memory leak that tmp allocated but maybe not used.
ulion
parents: 25266
diff changeset
1620 }
19478
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1621 }
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1622 }
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1623
26758
9fb1d2c3dbd4 cosmetics: Remove pointless parentheses from return statements.
diego
parents: 26437
diff changeset
1624 return ris != STREAM_UNSUPPORTED ? chapter : -1;
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1625 } else { // chapters structure is set in the demuxer
30378
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1626 sh_video_t *sh_video = demuxer->video->sh;
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1627 sh_audio_t *sh_audio = demuxer->audio->sh;
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1628
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1629 total = demuxer->num_chapters;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1630
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1631 if (mode == 1) //absolute seeking
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1632 current = chapter;
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1633 else { //relative seeking
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1634 uint64_t now;
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1635 now = (sh_video ? sh_video->pts : (sh_audio ? sh_audio->pts : 0.))
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1636 * 1000 + .5;
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1637
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1638 for (current = total - 1; current >= 0; --current) {
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
1639 demux_chapter_t *chapter = demuxer->chapters + current;
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1640 if (chapter->start <= now)
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1641 break;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1642 }
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1643 current += chapter;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1644 }
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1645
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1646 if (current >= total)
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1647 return -1;
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1648 if (current < 0)
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1649 current = 0;
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1650
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1651 *seek_pts = demuxer->chapters[current].start / 1000.0;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1652
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1653 if (num_chapters)
19478
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1654 *num_chapters = demuxer->num_chapters;
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1655
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1656 if (chapter_name) {
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1657 if (demuxer->chapters[current].name)
19479
8dd04ec733f5 100l: *chapter_name was copied from the pointer rather than strupd()-ed (and next free()d in mplayer.c
nicodvb
parents: 19478
diff changeset
1658 *chapter_name = strdup(demuxer->chapters[current].name);
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1659 else
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1660 *chapter_name = NULL;
19479
8dd04ec733f5 100l: *chapter_name was copied from the pointer rather than strupd()-ed (and next free()d in mplayer.c
nicodvb
parents: 19478
diff changeset
1661 }
19478
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1662
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1663 return current;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1664 }
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1665 }
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1666
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1667 int demuxer_get_current_chapter(demuxer_t *demuxer)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1668 {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1669 int chapter = -1;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1670 if (!demuxer->num_chapters || !demuxer->chapters) {
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1671 if (stream_control(demuxer->stream, STREAM_CTRL_GET_CURRENT_CHAPTER,
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1672 &chapter) == STREAM_UNSUPPORTED)
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1673 chapter = -1;
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1674 } else {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1675 sh_video_t *sh_video = demuxer->video->sh;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1676 sh_audio_t *sh_audio = demuxer->audio->sh;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1677 uint64_t now;
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1678 now = (sh_video ? sh_video->pts : (sh_audio ? sh_audio->pts : 0))
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1679 * 1000 + 0.5;
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1680 for (chapter = demuxer->num_chapters - 1; chapter >= 0; --chapter) {
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1681 if (demuxer->chapters[chapter].start <= now)
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1682 break;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1683 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1684 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1685 return chapter;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1686 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1687
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1688 char *demuxer_chapter_name(demuxer_t *demuxer, int chapter)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1689 {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1690 if (demuxer->num_chapters && demuxer->chapters) {
27056
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1691 if (chapter >= 0 && chapter < demuxer->num_chapters
ad1444d3ff26 cosmetics: Break overly long lines.
diego
parents: 27055
diff changeset
1692 && demuxer->chapters[chapter].name)
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1693 return strdup(demuxer->chapters[chapter].name);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1694 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1695 return NULL;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1696 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1697
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1698 char *demuxer_chapter_display_name(demuxer_t *demuxer, int chapter)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1699 {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1700 char *chapter_name = demuxer_chapter_name(demuxer, chapter);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1701 if (chapter_name) {
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1702 char *tmp = malloc(strlen(chapter_name) + 14);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1703 snprintf(tmp, 63, "(%d) %s", chapter + 1, chapter_name);
27051
414d5a794c35 cosmetics: Remove all trailing whitespace.
diego
parents: 27050
diff changeset
1704 free(chapter_name);
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1705 return tmp;
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1706 } else {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1707 int chapter_num = demuxer_chapter_count(demuxer);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1708 char tmp[30];
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1709 if (chapter_num <= 0)
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1710 sprintf(tmp, "(%d)", chapter + 1);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1711 else
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1712 sprintf(tmp, "(%d) of %d", chapter + 1, chapter_num);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1713 return strdup(tmp);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1714 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1715 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1716
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1717 float demuxer_chapter_time(demuxer_t *demuxer, int chapter, float *end)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1718 {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1719 if (demuxer->num_chapters && demuxer->chapters && chapter >= 0
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1720 && chapter < demuxer->num_chapters) {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1721 if (end)
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1722 *end = demuxer->chapters[chapter].end / 1000.0;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1723 return demuxer->chapters[chapter].start / 1000.0;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1724 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1725 return -1.0;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1726 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1727
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1728 int demuxer_chapter_count(demuxer_t *demuxer)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1729 {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1730 if (!demuxer->num_chapters || !demuxer->chapters) {
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1731 int num_chapters = 0;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1732 if (stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS,
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1733 &num_chapters) == STREAM_UNSUPPORTED)
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1734 num_chapters = 0;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1735 return num_chapters;
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1736 } else
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1737 return demuxer->num_chapters;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1738 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1739
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1740 int demuxer_angles_count(demuxer_t *demuxer)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1741 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1742 int ris, angles = -1;
25575
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1743
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1744 ris = stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_ANGLES, &angles);
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1745 if (ris == STREAM_UNSUPPORTED)
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1746 return -1;
25575
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1747 return angles;
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1748 }
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1749
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1750 int demuxer_get_current_angle(demuxer_t *demuxer)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1751 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1752 int ris, curr_angle = -1;
25575
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1753 ris = stream_control(demuxer->stream, STREAM_CTRL_GET_ANGLE, &curr_angle);
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1754 if (ris == STREAM_UNSUPPORTED)
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1755 return -1;
25575
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1756 return curr_angle;
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1757 }
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1758
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1759
27047
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1760 int demuxer_set_angle(demuxer_t *demuxer, int angle)
6ff2454fe5ec cosmetics: Make all function declarations consistent by moving the opening
diego
parents: 27046
diff changeset
1761 {
27055
03e4ae6a3704 cosmetics: indentation, whitespace changes
diego
parents: 27054
diff changeset
1762 int ris, angles = -1;
25575
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1763
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1764 angles = demuxer_angles_count(demuxer);
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1765 if ((angles < 1) || (angle > angles))
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1766 return -1;
25575
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1767
26926
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
1768 demux_flush(demuxer);
25575
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1769
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1770 ris = stream_control(demuxer->stream, STREAM_CTRL_SET_ANGLE, &angle);
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1771 if (ris == STREAM_UNSUPPORTED)
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1772 return -1;
25575
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1773
30378
8339bca8e4b4 Move the resync-related code into more consistent places instead of having it
reimar
parents: 30088
diff changeset
1774 demux_resync(demuxer);
25575
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1775
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1776 return angle;
f94eee219ee0 wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents: 25444
diff changeset
1777 }
26086
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1778
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
1779 int demuxer_audio_track_by_lang(demuxer_t *d, char *lang)
26086
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1780 {
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1781 int i, len;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1782 lang += strspn(lang, ",");
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1783 while ((len = strcspn(lang, ",")) > 0) {
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1784 for (i = 0; i < MAX_A_STREAMS; ++i) {
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
1785 sh_audio_t *sh = d->a_streams[i];
26086
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1786 if (sh && sh->lang && strncmp(sh->lang, lang, len) == 0)
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1787 return sh->aid;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1788 }
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1789 lang += len;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1790 lang += strspn(lang, ",");
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1791 }
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1792 return -1;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1793 }
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1794
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
1795 int demuxer_sub_track_by_lang(demuxer_t *d, char *lang)
26086
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1796 {
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1797 int i, len;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1798 lang += strspn(lang, ",");
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1799 while ((len = strcspn(lang, ",")) > 0) {
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1800 for (i = 0; i < MAX_S_STREAMS; ++i) {
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
1801 sh_sub_t *sh = d->s_streams[i];
26086
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1802 if (sh && sh->lang && strncmp(sh->lang, lang, len) == 0)
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1803 return sh->sid;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1804 }
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1805 lang += len;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1806 lang += strspn(lang, ",");
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1807 }
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1808 return -1;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1809 }
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1810
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
1811 int demuxer_default_audio_track(demuxer_t *d)
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1812 {
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1813 int i;
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1814 for (i = 0; i < MAX_A_STREAMS; ++i) {
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
1815 sh_audio_t *sh = d->a_streams[i];
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1816 if (sh && sh->default_track)
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1817 return sh->aid;
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1818 }
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1819 for (i = 0; i < MAX_A_STREAMS; ++i) {
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
1820 sh_audio_t *sh = d->a_streams[i];
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1821 if (sh)
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1822 return sh->aid;
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1823 }
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1824 return -1;
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1825 }
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1826
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
1827 int demuxer_default_sub_track(demuxer_t *d)
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1828 {
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1829 int i;
27049
762a9c6bfb43 cosmetics: Consistently format all if, for, while constructs.
diego
parents: 27048
diff changeset
1830 for (i = 0; i < MAX_S_STREAMS; ++i) {
27054
eb7dfb6481c1 cosmetics: consistent * placement
diego
parents: 27053
diff changeset
1831 sh_sub_t *sh = d->s_streams[i];
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1832 if (sh && sh->default_track)
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1833 return sh->sid;
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1834 }
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1835 return -1;
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1836 }