annotate libmpdemux/demuxer.c @ 26926:1e6241274552

added and reused demux_flush() instead of emptying the demux_stream buffers; patch by Bryan Henderson - giraffedata gmail com
author nicodvb
date Mon, 02 Jun 2008 10:17:48 +0000
parents d99d0f7c0e80
children 66cda68db746
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1 //=================== DEMUXER v2.5 =========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
3 #include <stdio.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
4 #include <stdlib.h>
3150
8dae87740d33 bad malloc+strcpy => strdup
arpi
parents: 3101
diff changeset
5 #include <string.h>
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
6 #include <unistd.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
7
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1421
diff changeset
8 #include <sys/types.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1421
diff changeset
9 #include <sys/stat.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1421
diff changeset
10
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
11 #include "config.h"
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
12 #include "mp_msg.h"
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1567
diff changeset
13 #include "help_mp.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16925
diff changeset
14 #include "m_config.h"
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
15
17200
a1b8eeffdfcd include fastmemcpy.h before stream.h, so it is used for the stream_read
reimar
parents: 17012
diff changeset
16 #include "libvo/fastmemcpy.h"
a1b8eeffdfcd include fastmemcpy.h before stream.h, so it is used for the stream_read
reimar
parents: 17012
diff changeset
17
22605
4d81dbdf46b9 Add explicit location for headers from the stream/ directory.
diego
parents: 22488
diff changeset
18 #include "stream/stream.h"
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
19 #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
20 #include "stheader.h"
4551
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
21 #include "mf.h"
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
22
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16925
diff changeset
23 #include "libaf/af_format.h"
5084
2fd327bf64fc added get_sh_video/audio and realmedia seeking
alex
parents: 5068
diff changeset
24
25654
0190aa38aae2 Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents: 25652
diff changeset
25 #ifdef USE_ASS
0190aa38aae2 Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents: 25652
diff changeset
26 #include "libass/ass.h"
0190aa38aae2 Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents: 25652
diff changeset
27 #include "libass/ass_mp.h"
0190aa38aae2 Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents: 25652
diff changeset
28 #endif
0190aa38aae2 Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents: 25652
diff changeset
29
22142
84f95595f31f Fix a few gcc warnings, approved by Diego and Reimar.
rathann
parents: 21809
diff changeset
30 extern void resync_video_stream(sh_video_t *sh_video);
16877
9081ae3a702c move resync_audio_stream after seeking to demuxer.c
reimar
parents: 16572
diff changeset
31 extern void resync_audio_stream(sh_audio_t *sh_audio);
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
32
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
33 // Demuxer list
25707
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
34 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
35 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
36 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
37 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
38 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
39 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
40 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
41 extern const demuxer_desc_t demuxer_desc_nuv;
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 25706
diff changeset
42 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
43 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
44 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
45 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
46 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
47 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
48 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
49 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
50 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
51 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
52 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
53 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
54 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
55 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
56 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
57 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
58 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
59 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
60 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
61 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
62 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
63 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
64 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
65 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
66 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
67 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
68 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
69 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
70 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
71 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
72 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
73 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
74 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
75 extern const demuxer_desc_t demuxer_desc_nut;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
76
25876
edfe8baed49f copy note on new demuxers and codecs to the top of the array as well to be
ivo
parents: 25872
diff changeset
77 /* 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
78 * 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
79 * 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
80
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
81 const demuxer_desc_t* const demuxer_list[] = {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
82 &demuxer_desc_rawaudio,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
83 &demuxer_desc_rawvideo,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
84 #ifdef USE_TV
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
85 &demuxer_desc_tv,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
86 #endif
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
87 &demuxer_desc_mf,
23121
a257dd426da5 Simplify preprocessor directives: There is a general variable for
diego
parents: 23072
diff changeset
88 #ifdef USE_LIBAVFORMAT
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
89 &demuxer_desc_lavf_preferred,
23069
93948eb0280f demuxer_desc_lavf_preferred depends on USE_LIBAVFORMAT or USE_LIBAVFORMAT_SO
nicodvb
parents: 22971
diff changeset
90 #endif
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
91 &demuxer_desc_avi,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
92 &demuxer_desc_y4m,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
93 &demuxer_desc_asf,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
94 &demuxer_desc_nsv,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
95 &demuxer_desc_nuv,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
96 &demuxer_desc_real,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
97 &demuxer_desc_smjpeg,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
98 &demuxer_desc_matroska,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
99 &demuxer_desc_realaudio,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
100 &demuxer_desc_vqf,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
101 &demuxer_desc_mov,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
102 &demuxer_desc_vivo,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
103 &demuxer_desc_fli,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
104 &demuxer_desc_film,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
105 &demuxer_desc_roq,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
106 #ifdef HAVE_GIF
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
107 &demuxer_desc_gif,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
108 #endif
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
109 #ifdef HAVE_OGGVORBIS
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
110 &demuxer_desc_ogg,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
111 #endif
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
112 #ifdef USE_WIN32DLL
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
113 &demuxer_desc_avs,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
114 #endif
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
115 &demuxer_desc_pva,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
116 &demuxer_desc_mpeg_ts,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
117 &demuxer_desc_lmlm4,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
118 &demuxer_desc_mpeg_ps,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
119 &demuxer_desc_mpeg_pes,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
120 &demuxer_desc_mpeg_es,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
121 &demuxer_desc_mpeg_gxf,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
122 &demuxer_desc_mpeg4_es,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
123 &demuxer_desc_h264_es,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
124 &demuxer_desc_audio,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
125 &demuxer_desc_mpeg_ty,
25266
239330301b33 Make libnemesi use specific struct and DEMUXER_TYPE
lu_zero
parents: 25197
diff changeset
126 #ifdef STREAMING_LIVE555
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
127 &demuxer_desc_rtp,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
128 #endif
25266
239330301b33 Make libnemesi use specific struct and DEMUXER_TYPE
lu_zero
parents: 25197
diff changeset
129 #ifdef LIBNEMESI
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
130 &demuxer_desc_rtp_nemesi,
25266
239330301b33 Make libnemesi use specific struct and DEMUXER_TYPE
lu_zero
parents: 25197
diff changeset
131 #endif
23121
a257dd426da5 Simplify preprocessor directives: There is a general variable for
diego
parents: 23072
diff changeset
132 #ifdef USE_LIBAVFORMAT
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
133 &demuxer_desc_lavf,
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
134 #endif
26873
a90971b955af Move native musepack demuxer further down in demuxer list
reimar
parents: 26758
diff changeset
135 #ifdef MUSEPACK
a90971b955af Move native musepack demuxer further down in demuxer list
reimar
parents: 26758
diff changeset
136 &demuxer_desc_mpc,
a90971b955af Move native musepack demuxer further down in demuxer list
reimar
parents: 26758
diff changeset
137 #endif
18900
0b53e6d1b27f move some ill-behaving demuxers further down the list
reimar
parents: 18708
diff changeset
138 #ifdef HAVE_LIBDV095
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
139 &demuxer_desc_rawdv,
18900
0b53e6d1b27f move some ill-behaving demuxers further down the list
reimar
parents: 18708
diff changeset
140 #endif
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
141 &demuxer_desc_aac,
19861
b251bca5820c Add demux_nut to MPlayer repo
ods15
parents: 19540
diff changeset
142 #ifdef HAVE_LIBNUT
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
143 &demuxer_desc_nut,
19861
b251bca5820c Add demux_nut to MPlayer repo
ods15
parents: 19540
diff changeset
144 #endif
18900
0b53e6d1b27f move some ill-behaving demuxers further down the list
reimar
parents: 18708
diff changeset
145 #ifdef HAVE_XMMS
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
146 &demuxer_desc_xmms,
18900
0b53e6d1b27f move some ill-behaving demuxers further down the list
reimar
parents: 18708
diff changeset
147 #endif
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
148 /* Please do not add any new demuxers here. If you want to implement a new
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
149 * demuxer, add it to libavformat, except for wrappers around external
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
150 * libraries and demuxers requiring binary support. */
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
151 NULL
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
152 };
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
153
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
154 void free_demuxer_stream(demux_stream_t *ds){
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
155 ds_free_packs(ds);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
156 free(ds);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
157 }
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
158
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
159 demux_stream_t* new_demuxer_stream(struct demuxer_st *demuxer,int id){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
160 demux_stream_t* ds=malloc(sizeof(demux_stream_t));
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
161 ds->buffer_pos=ds->buffer_size=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
162 ds->buffer=NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
163 ds->pts=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
164 ds->pts_bytes=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
165 ds->eof=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
166 ds->pos=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
167 ds->dpos=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
168 ds->pack_no=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
169 //---------------
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
170 ds->packs=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
171 ds->bytes=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
172 ds->first=ds->last=ds->current=NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
173 ds->id=id;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
174 ds->demuxer=demuxer;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
175 //----------------
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
176 ds->asf_seq=-1;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
177 ds->asf_packet=NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
178 //----------------
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
179 ds->ss_mul=ds->ss_div=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
180 //----------------
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
181 ds->sh=NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
182 return ds;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
183 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
184
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
185
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
186 /**
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
187 * Get demuxer description structure for a given demuxer type
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
188 *
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
189 * @param file_format type of the demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
190 * @return structure for the demuxer, NULL if not found
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
191 */
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
192 static const demuxer_desc_t* get_demuxer_desc_from_type(int file_format)
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
193 {
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
194 int i;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
195
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
196 for (i = 0; demuxer_list[i]; i++)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
197 if (file_format == demuxer_list[i]->type)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
198 return demuxer_list[i];
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
199
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
200 return NULL;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
201 }
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
202
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
203
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
204 demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id,char *filename){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
205 demuxer_t *d=malloc(sizeof(demuxer_t));
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
206 memset(d,0,sizeof(demuxer_t));
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
207 d->stream=stream;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
208 d->stream_pts = MP_NOPTS_VALUE;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
209 d->reference_clock = MP_NOPTS_VALUE;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
210 d->movi_start=stream->start_pos;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
211 d->movi_end=stream->end_pos;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
212 d->seekable=1;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
213 d->synced=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
214 d->filepos=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
215 d->audio=new_demuxer_stream(d,a_id);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
216 d->video=new_demuxer_stream(d,v_id);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
217 d->sub=new_demuxer_stream(d,s_id);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
218 d->type=type;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
219 if(type)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
220 if (!(d->desc = get_demuxer_desc_from_type(type)))
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
221 mp_msg(MSGT_DEMUXER,MSGL_ERR,"BUG! Invalid demuxer type in new_demuxer(), big troubles ahead.");
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
222 if(filename) // Filename hack for avs_check_file
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
223 d->filename=strdup(filename);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
224 stream_reset(stream);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
225 stream_seek(stream,stream->start_pos);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
226 return d;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
227 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
228
24022
4d576e0ed40b When a new subtitle stream becomes available check if it is the one that
reimar
parents: 23865
diff changeset
229 extern int dvdsub_id;
4d576e0ed40b When a new subtitle stream becomes available check if it is the one that
reimar
parents: 23865
diff changeset
230
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
231 sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
232 if (id > MAX_S_STREAMS - 1 || id < 0) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
233 mp_msg(MSGT_DEMUXER,MSGL_WARN,"Requested sub stream id overflow (%d > %d)\n",
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
234 id, MAX_S_STREAMS);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
235 return NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
236 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
237 if (demuxer->s_streams[id])
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
238 mp_msg(MSGT_DEMUXER, MSGL_WARN, "Sub stream %i redefined\n", id);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
239 else {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
240 sh_sub_t *sh = calloc(1, sizeof(sh_sub_t));
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
241 demuxer->s_streams[id] = sh;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
242 sh->sid = sid;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
243 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
244 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
245 return demuxer->s_streams[id];
20872
a8b42366e68a Make subtitle stream handling more similar to audio and video streams.
reimar
parents: 20851
diff changeset
246 }
a8b42366e68a Make subtitle stream handling more similar to audio and video streams.
reimar
parents: 20851
diff changeset
247
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
248 void free_sh_sub(sh_sub_t *sh) {
23592
76bed8202233 Fix memleak due to not freeing demuxer->s_streams
reimar
parents: 23552
diff changeset
249 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
250 free(sh->extradata);
25702
c4275201a489 Add a forgotten #ifdef USE_ASS around ass_free_track
reimar
parents: 25657
diff changeset
251 #ifdef USE_ASS
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
252 if (sh->ass_track) ass_free_track(sh->ass_track);
25702
c4275201a489 Add a forgotten #ifdef USE_ASS around ass_free_track
reimar
parents: 25657
diff changeset
253 #endif
26082
026b1ac69d47 Add language info to sh_sub_t and sh_audio_t.
eugeni
parents: 26071
diff changeset
254 free(sh->lang);
23592
76bed8202233 Fix memleak due to not freeing demuxer->s_streams
reimar
parents: 23552
diff changeset
255 free(sh);
76bed8202233 Fix memleak due to not freeing demuxer->s_streams
reimar
parents: 23552
diff changeset
256 }
76bed8202233 Fix memleak due to not freeing demuxer->s_streams
reimar
parents: 23552
diff changeset
257
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
258 sh_audio_t* new_sh_audio_aid(demuxer_t *demuxer,int id,int aid){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
259 if(id > MAX_A_STREAMS-1 || id < 0)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
260 {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
261 mp_msg(MSGT_DEMUXER,MSGL_WARN,"Requested audio stream id overflow (%d > %d)\n",
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
262 id, MAX_A_STREAMS);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
263 return NULL;
4642
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4587
diff changeset
264 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
265 if(demuxer->a_streams[id]){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
266 mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_AudioStreamRedefined,id);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
267 } else {
26874
c73c138aad88 Cosmetics: simplify
reimar
parents: 26873
diff changeset
268 sh_audio_t *sh = calloc(1, sizeof(sh_audio_t));
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
269 mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_FoundAudioStream,id);
26874
c73c138aad88 Cosmetics: simplify
reimar
parents: 26873
diff changeset
270 demuxer->a_streams[id] = sh;
26875
c276296cb6f8 Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents: 26874
diff changeset
271 sh->aid = aid;
26876
d99d0f7c0e80 Initialize sh_audio/sh_video->ds
reimar
parents: 26875
diff changeset
272 sh->ds = demuxer->audio;
13357
c605df89ca9f moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents: 13301
diff changeset
273 // set some defaults
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
274 sh->samplesize=2;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
275 sh->sample_format=AF_FORMAT_S16_NE;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
276 sh->audio_out_minsize=8192;/* default size, maybe not enough for Win32/ACM*/
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
277 sh->pts=MP_NOPTS_VALUE;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
278 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", aid);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
279 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
280 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
281 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
282
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
283 void free_sh_audio(demuxer_t *demuxer, int id) {
18708
9e2b300db17b Change free_sh_audio() to take demuxer and stream id as parameters
uau
parents: 18404
diff changeset
284 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
285 demuxer->a_streams[id] = NULL;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
286 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
287 free(sh->wf);
681f6ae38b68 Remove stupid checks of free() argument.
eugeni
parents: 26082
diff changeset
288 free(sh->codecdata);
26082
026b1ac69d47 Add language info to sh_sub_t and sh_audio_t.
eugeni
parents: 26071
diff changeset
289 free(sh->lang);
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
290 free(sh);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
291 }
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
292
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
293 sh_video_t* new_sh_video_vid(demuxer_t *demuxer,int id,int vid){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
294 if(id > MAX_V_STREAMS-1 || id < 0)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
295 {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
296 mp_msg(MSGT_DEMUXER,MSGL_WARN,"Requested video stream id overflow (%d > %d)\n",
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
297 id, MAX_V_STREAMS);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
298 return NULL;
4642
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4587
diff changeset
299 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
300 if(demuxer->v_streams[id]){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
301 mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_VideoStreamRedefined,id);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
302 } else {
26875
c276296cb6f8 Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents: 26874
diff changeset
303 sh_video_t *sh = calloc(1, sizeof(sh_video_t));
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
304 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
305 demuxer->v_streams[id] = sh;
c276296cb6f8 Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents: 26874
diff changeset
306 sh->vid = vid;
26876
d99d0f7c0e80 Initialize sh_audio/sh_video->ds
reimar
parents: 26875
diff changeset
307 sh->ds = demuxer->video;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
308 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", vid);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
309 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
310 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
311 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
312
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
313 void free_sh_video(sh_video_t* sh){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
314 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
315 free(sh->bih);
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
316 free(sh);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
317 }
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
318
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
319 void free_demuxer(demuxer_t *demuxer){
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
320 int i;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
321 mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing demuxer at %p\n",demuxer);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
322 if(demuxer->desc->close)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
323 demuxer->desc->close(demuxer);
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
324 // Very ugly hack to make it behave like old implementation
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
325 if (demuxer->desc->type == DEMUXER_TYPE_DEMUXERS)
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
326 goto skip_streamfree;
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
327 // free streams:
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
328 for(i = 0; i < MAX_A_STREAMS; i++)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
329 if(demuxer->a_streams[i]) free_sh_audio(demuxer, i);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
330 for(i = 0; i < MAX_V_STREAMS; i++)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
331 if(demuxer->v_streams[i]) free_sh_video(demuxer->v_streams[i]);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
332 for(i = 0; i < MAX_S_STREAMS; i++)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
333 if(demuxer->s_streams[i]) free_sh_sub(demuxer->s_streams[i]);
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
334 // free demuxers:
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
335 free_demuxer_stream(demuxer->audio);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
336 free_demuxer_stream(demuxer->video);
5412
db582be1b590 added soem debug prints, and fixed 10l bug of Alban
arpi
parents: 5214
diff changeset
337 free_demuxer_stream(demuxer->sub);
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
338 skip_streamfree:
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
339 if(demuxer->info) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
340 for(i=0;demuxer->info[i] != NULL; i++)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
341 free(demuxer->info[i]);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
342 free(demuxer->info);
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4660
diff changeset
343 }
26085
681f6ae38b68 Remove stupid checks of free() argument.
eugeni
parents: 26082
diff changeset
344 free(demuxer->filename);
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
345 if (demuxer->chapters) {
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
346 for (i=0; i<demuxer->num_chapters; i++)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
347 free(demuxer->chapters[i].name);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
348 free(demuxer->chapters);
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
349 }
25657
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
350 if (demuxer->attachments) {
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
351 for (i=0; i<demuxer->num_attachments; i++) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
352 free(demuxer->attachments[i].name);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
353 free(demuxer->attachments[i].type);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
354 free(demuxer->attachments[i].data);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
355 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
356 free(demuxer->attachments);
25657
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
357 }
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
358 free(demuxer);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
359 }
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
360
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
361
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
362 void ds_add_packet(demux_stream_t *ds,demux_packet_t* dp){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
363 // demux_packet_t* dp=new_demux_packet(len);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
364 // stream_read(stream,dp->buffer,len);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
365 // dp->pts=pts; //(float)pts/90000.0f;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
366 // dp->pos=pos;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
367 // append packet to DS stream:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
368 ++ds->packs;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
369 ds->bytes+=dp->len;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
370 if(ds->last){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
371 // next packet in stream
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
372 ds->last->next=dp;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
373 ds->last=dp;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
374 } else {
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
375 // first packet in stream
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
376 ds->first=ds->last=dp;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
377 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
378 mp_dbg(MSGT_DEMUXER,MSGL_DBG2,"DEMUX: Append packet to %s, len=%d pts=%5.3f pos=%u [packs: A=%d V=%d]\n",
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
379 (ds==ds->demuxer->audio)?"d_audio":"d_video",
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
380 dp->len,dp->pts,(unsigned int)dp->pos,ds->demuxer->audio->packs,ds->demuxer->video->packs);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
381 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
382
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
383 void ds_read_packet(demux_stream_t *ds, stream_t *stream, int len, double pts, off_t pos, int flags) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
384 demux_packet_t* dp=new_demux_packet(len);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
385 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
386 resize_demux_packet(dp, len);
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
387 dp->pts=pts; //(float)pts/90000.0f;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
388 dp->pos=pos;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
389 dp->flags=flags;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
390 // append packet to DS stream:
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
391 ds_add_packet(ds,dp);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
392 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
393
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
394 // return value:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
395 // 0 = EOF or no stream found or invalid type
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
396 // 1 = successfully read a packet
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
397
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
398 int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
399 // Note: parameter 'ds' can be NULL!
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
400 // printf("demux->type=%d\n",demux->type);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
401 return demux->desc->fill_buffer(demux, ds);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
402 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
403
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
404 // return value:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
405 // 0 = EOF
25197
eb2c5925ec34 Fix typos in comments to stop them hurting my eyes
reimar
parents: 24826
diff changeset
406 // 1 = successful
26037
bee99864f397 New member in demuxer_t: reference_clock.
nicodvb
parents: 25956
diff changeset
407 #define MAX_ACUMULATED_PACKETS 64
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
408 int ds_fill_buffer(demux_stream_t *ds){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
409 demuxer_t *demux=ds->demuxer;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
410 if(ds->current) free_demux_packet(ds->current);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
411 ds->current=NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
412 if( mp_msg_test(MSGT_DEMUXER,MSGL_DBG3) ){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
413 if(ds==demux->audio) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_audio) called\n");else
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
414 if(ds==demux->video) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_video) called\n");else
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
415 if(ds==demux->sub) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_sub) called\n");else
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
416 mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(unknown 0x%X) called\n",(unsigned int)ds);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
417 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
418 while(1){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
419 if(ds->packs){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
420 demux_packet_t *p=ds->first;
26071
449ad51bd8c7 in ds_fill_buffer() disabled the code that demuxes until the arrival of the right reference_clock
nicodvb
parents: 26037
diff changeset
421 #if 0
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
422 if(demux->reference_clock != MP_NOPTS_VALUE) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
423 if((p->pts != MP_NOPTS_VALUE) && (p->pts > demux->reference_clock)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
424 && (ds->packs < MAX_ACUMULATED_PACKETS)) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
425 if(demux_fill_buffer(demux,ds))
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
426 continue;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
427 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
428 }
26071
449ad51bd8c7 in ds_fill_buffer() disabled the code that demuxes until the arrival of the right reference_clock
nicodvb
parents: 26037
diff changeset
429 #endif
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
430 // copy useful data:
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
431 ds->buffer=p->buffer;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
432 ds->buffer_pos=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
433 ds->buffer_size=p->len;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
434 ds->pos=p->pos;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
435 ds->dpos+=p->len; // !!!
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
436 ++ds->pack_no;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
437 if (p->pts != MP_NOPTS_VALUE) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
438 ds->pts=p->pts;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
439 ds->pts_bytes=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
440 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
441 ds->pts_bytes+=p->len; // !!!
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
442 if(p->stream_pts != MP_NOPTS_VALUE) demux->stream_pts=p->stream_pts;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
443 ds->flags=p->flags;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
444 // unlink packet:
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
445 ds->bytes-=p->len;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
446 ds->current=p;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
447 ds->first=p->next;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
448 if(!ds->first) ds->last=NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
449 --ds->packs;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
450 return 1; //ds->buffer_size;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
451 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
452 if(demux->audio->packs>=MAX_PACKS || demux->audio->bytes>=MAX_PACK_BYTES){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
453 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyAudioInBuffer,demux->audio->packs,demux->audio->bytes);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
454 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
455 break;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
456 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
457 if(demux->video->packs>=MAX_PACKS || demux->video->bytes>=MAX_PACK_BYTES){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
458 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyVideoInBuffer,demux->video->packs,demux->video->bytes);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
459 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
460 break;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
461 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
462 if(!demux_fill_buffer(demux,ds)){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
463 mp_dbg(MSGT_DEMUXER,MSGL_DBG2,"ds_fill_buffer()->demux_fill_buffer() failed\n");
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
464 break; // EOF
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
465 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
466 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
467 ds->buffer_pos=ds->buffer_size=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
468 ds->buffer=NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
469 mp_msg(MSGT_DEMUXER,MSGL_V,"ds_fill_buffer: EOF reached (stream: %s) \n",ds==demux->audio?"audio":"video");
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
470 ds->eof=1;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
471 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
472 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
473
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
474 int demux_read_data(demux_stream_t *ds,unsigned char* mem,int len){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
475 int x;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
476 int bytes=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
477 while(len>0){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
478 x=ds->buffer_size-ds->buffer_pos;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
479 if(x==0){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
480 if(!ds_fill_buffer(ds)) return bytes;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
481 } else {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
482 if(x>len) x=len;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
483 if(mem) fast_memcpy(mem+bytes,&ds->buffer[ds->buffer_pos],x);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
484 bytes+=x;len-=x;ds->buffer_pos+=x;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
485 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
486 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
487 return bytes;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
488 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
489
17417
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
490 /**
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
491 * \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
492 * \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
493 * \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
494 * \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
495 * \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
496 * \return whether pattern was found
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
497 */
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
498 int demux_pattern_3(demux_stream_t *ds, unsigned char *mem, int maxlen,
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
499 int *read, uint32_t pattern) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
500 register uint32_t head = 0xffffff00;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
501 register uint32_t pat = pattern & 0xffffff00;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
502 int total_len = 0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
503 do {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
504 register unsigned char *ds_buf = &ds->buffer[ds->buffer_size];
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
505 int len = ds->buffer_size - ds->buffer_pos;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
506 register long pos = -len;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
507 if (unlikely(pos >= 0)) { // buffer is empty
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
508 ds_fill_buffer(ds);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
509 continue;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
510 }
17417
960b2fa1567e function to read from a demuxer up to (and including) the specified
reimar
parents: 17366
diff changeset
511 do {
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
512 head |= ds_buf[pos];
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
513 head <<= 8;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
514 } while (++pos && head != pat);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
515 len += pos;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
516 if (total_len + len > maxlen)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
517 len = maxlen - total_len;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
518 len = demux_read_data(ds, mem ? &mem[total_len] : NULL, len);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
519 total_len += len;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
520 } while ((head != pat || total_len < 3) && total_len < maxlen && !ds->eof);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
521 if (read)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
522 *read = total_len;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
523 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
524 }
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
525
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
526 void ds_free_packs(demux_stream_t *ds){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
527 demux_packet_t *dp=ds->first;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
528 while(dp){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
529 demux_packet_t *dn=dp->next;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
530 free_demux_packet(dp);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
531 dp=dn;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
532 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
533 if(ds->asf_packet){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
534 // free unfinished .asf fragments:
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
535 free(ds->asf_packet->buffer);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
536 free(ds->asf_packet);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
537 ds->asf_packet=NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
538 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
539 ds->first=ds->last=NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
540 ds->packs=0; // !!!!!
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
541 ds->bytes=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
542 if(ds->current) free_demux_packet(ds->current);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
543 ds->current=NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
544 ds->buffer=NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
545 ds->buffer_pos=ds->buffer_size;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
546 ds->pts=0; ds->pts_bytes=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
547 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
548
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
549 int ds_get_packet(demux_stream_t *ds,unsigned char **start){
24826
ac881f93b661 demuxer.c: Remove useless code
uau
parents: 24678
diff changeset
550 int len;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
551 if(ds->buffer_pos>=ds->buffer_size){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
552 if(!ds_fill_buffer(ds)){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
553 // EOF
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
554 *start = NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
555 return -1;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
556 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
557 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
558 len=ds->buffer_size-ds->buffer_pos;
24826
ac881f93b661 demuxer.c: Remove useless code
uau
parents: 24678
diff changeset
559 *start = &ds->buffer[ds->buffer_pos];
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
560 ds->buffer_pos+=len;
24826
ac881f93b661 demuxer.c: Remove useless code
uau
parents: 24678
diff changeset
561 return len;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
562 }
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
563
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
564 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
565 {
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
566 int len;
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
567 *pts = MP_NOPTS_VALUE;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
568 if(ds->buffer_pos>=ds->buffer_size){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
569 if (!ds_fill_buffer(ds)) {
18242
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
570 // EOF
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
571 *start = NULL;
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
572 return -1;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
573 }
18242
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
574 }
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18900
diff changeset
575 // Return pts unless this read starts from the middle of a packet
25956
7e4a2ab8b61c Change to always use MP_NOPTS_VALUE (instead of sometimes 0) for unknown pts.
reimar
parents: 25919
diff changeset
576 if (!ds->buffer_pos)
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
577 *pts = ds->current->pts;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
578 len=ds->buffer_size-ds->buffer_pos;
18242
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
579 *start = &ds->buffer[ds->buffer_pos];
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
580 ds->buffer_pos+=len;
18242
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
581 return len;
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
582 }
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 18237
diff changeset
583
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
584 int ds_get_packet_sub(demux_stream_t *ds,unsigned char **start){
24826
ac881f93b661 demuxer.c: Remove useless code
uau
parents: 24678
diff changeset
585 int len;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
586 if(ds->buffer_pos>=ds->buffer_size){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
587 *start = NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
588 if(!ds->packs) return -1; // no sub
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
589 if(!ds_fill_buffer(ds)) return -1; // EOF
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
590 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
591 len=ds->buffer_size-ds->buffer_pos;
24826
ac881f93b661 demuxer.c: Remove useless code
uau
parents: 24678
diff changeset
592 *start = &ds->buffer[ds->buffer_pos];
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
593 ds->buffer_pos+=len;
24826
ac881f93b661 demuxer.c: Remove useless code
uau
parents: 24678
diff changeset
594 return len;
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
595 }
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
596
18309
87161f96fa66 Change common pts variables from floats to doubles. Individual demuxers
uau
parents: 18242
diff changeset
597 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
598 {
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
599 demuxer_t* demux = ds->demuxer;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
600 while(!ds->first) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
601 if(demux->audio->packs>=MAX_PACKS || demux->audio->bytes>=MAX_PACK_BYTES){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
602 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyAudioInBuffer,demux->audio->packs,demux->audio->bytes);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
603 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
604 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
605 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
606 if(demux->video->packs>=MAX_PACKS || demux->video->bytes>=MAX_PACK_BYTES){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
607 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyVideoInBuffer,demux->video->packs,demux->video->bytes);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
608 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
609 return MP_NOPTS_VALUE;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
610 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
611 if(!demux_fill_buffer(demux,ds))
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
612 return MP_NOPTS_VALUE;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
613 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
614 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
615 }
68cac7ecaf05 Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents: 5897
diff changeset
616
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
617 // ====================================================================
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
618
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
619 void demuxer_help(void)
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
620 {
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
621 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
622
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
623 mp_msg(MSGT_DEMUXER, MSGL_INFO, "Available demuxers:\n");
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
624 mp_msg(MSGT_DEMUXER, MSGL_INFO, " demuxer: type info: (comment)\n");
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
625 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DEMUXERS\n");
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
626 for (i = 0; demuxer_list[i]; i++) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
627 if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Don't display special demuxers
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
628 continue;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
629 if (demuxer_list[i]->comment && strlen(demuxer_list[i]->comment))
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
630 mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %2d %s (%s)\n",
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
631 demuxer_list[i]->name, demuxer_list[i]->type, demuxer_list[i]->info, demuxer_list[i]->comment);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
632 else
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
633 mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %2d %s\n",
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
634 demuxer_list[i]->name, demuxer_list[i]->type, demuxer_list[i]->info);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
635 }
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
636 }
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
637
14693
37116118ab6a avisynth demuxer patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents: 14666
diff changeset
638
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
639 /**
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
640 * Get demuxer type for a given demuxer name
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
641 *
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
642 * @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
643 * @param force will be set if demuxer should be forced.
efbfac98cab1 Allow forcing of demuxers and codecs by prepending '+'
reimar
parents: 16310
diff changeset
644 * May be NULL.
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
645 * @return DEMUXER_TYPE_xxx, -1 if error or not found
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
646 */
16321
efbfac98cab1 Allow forcing of demuxers and codecs by prepending '+'
reimar
parents: 16310
diff changeset
647 int get_demuxer_type_from_name(char *demuxer_name, int *force)
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
648 {
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
649 int i;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
650 long type_int;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
651 char *endptr;
5133
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 5107
diff changeset
652
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
653 if (!demuxer_name || !demuxer_name[0])
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
654 return DEMUXER_TYPE_UNKNOWN;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
655 if (force) *force = demuxer_name[0] == '+';
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
656 if (demuxer_name[0] == '+')
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
657 demuxer_name = &demuxer_name[1];
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
658 for (i = 0; demuxer_list[i]; i++) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
659 if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Can't select special demuxers from commandline
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
660 continue;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
661 if (strcmp(demuxer_name, demuxer_list[i]->name) == 0)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
662 return demuxer_list[i]->type;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
663 }
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
664
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
665 // No match found, try to parse name as an integer (demuxer number)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
666 type_int = strtol(demuxer_name, &endptr, 0);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
667 if (*endptr) // Conversion failed
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
668 return -1;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
669 if ((type_int > 0) && (type_int <= DEMUXER_TYPE_MAX))
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
670 return (int)type_int;
26379
fa8997230d4e Reformat demuxer.c
uau
parents: 26378
diff changeset
671
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
672 return -1;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
673 }
3801
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
674
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
675 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
676
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
677 int correct_pts=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
678 int user_correct_pts=-1;
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18900
diff changeset
679
9751
00c97b0891e3 Fix all demuxers wich where using a global var to enable themself.
albeu
parents: 9709
diff changeset
680 /*
00c97b0891e3 Fix all demuxers wich where using a global var to enable themself.
albeu
parents: 9709
diff changeset
681 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
682 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
683 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
684 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
685 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
686 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
687 to the right type (ex: rawaudio,rawvideo).
25197
eb2c5925ec34 Fix typos in comments to stop them hurting my eyes
reimar
parents: 24826
diff changeset
688 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
689 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
690 (ex: tv,mf).
00c97b0891e3 Fix all demuxers wich where using a global var to enable themself.
albeu
parents: 9709
diff changeset
691 */
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
692
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
693 static demuxer_t* demux_open_stream(stream_t *stream, int file_format,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
694 int force, int audio_id, int video_id, int dvdsub_id,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
695 char* filename) {
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
696
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
697 //int file_format=(*file_format_ptr);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
698
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
699 demuxer_t *demuxer=NULL;
1659
6b71bbf515e4 num_elementary_packets1xx reset
arpi
parents: 1657
diff changeset
700
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
701 sh_video_t *sh_video=NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
702
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
703 const demuxer_desc_t *demuxer_desc;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
704 int fformat = 0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
705 int i;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
706
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
707 //printf("demux_open(%p,%d,%d,%d,%d) \n",stream,file_format,audio_id,video_id,dvdsub_id);
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents: 6192
diff changeset
708
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
709 // If somebody requested a demuxer check it
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
710 if (file_format) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
711 if ((demuxer_desc = get_demuxer_desc_from_type(file_format))) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
712 demuxer = new_demuxer(stream,demuxer_desc->type,audio_id,video_id,dvdsub_id,filename);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
713 if (demuxer_desc->check_file)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
714 fformat = demuxer_desc->check_file(demuxer);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
715 if (force || !demuxer_desc->check_file)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
716 fformat = demuxer_desc->type;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
717 if (fformat != 0) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
718 if (fformat == demuxer_desc->type) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
719 demuxer_t *demux2 = demuxer;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
720 // Move messages to demuxer detection code?
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
721 mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_Detected_XXX_FileFormat, demuxer_desc->shortdesc);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
722 file_format = fformat;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
723 if (!demuxer->desc->open || (demux2 = demuxer->desc->open(demuxer))) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
724 demuxer = demux2;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
725 goto dmx_open;
20303
21dd6cf54fff Try other demuxers if open() fails.
reimar
parents: 20072
diff changeset
726 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
727 } else {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
728 // Format changed after check, recurse
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
729 free_demuxer(demuxer);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
730 return demux_open_stream(stream, fformat, force,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
731 audio_id, video_id, dvdsub_id, filename);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
732 }
20303
21dd6cf54fff Try other demuxers if open() fails.
reimar
parents: 20072
diff changeset
733 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
734 // Check failed for forced demuxer, quit
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
735 free_demuxer(demuxer);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
736 return NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
737 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
738 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
739
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
740 // Test demuxers with safe file checks
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
741 for (i = 0; (demuxer_desc = demuxer_list[i]); i++) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
742 if (demuxer_desc->safe_check) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
743 demuxer = new_demuxer(stream,demuxer_desc->type,audio_id,video_id,dvdsub_id,filename);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
744 if ((fformat = demuxer_desc->check_file(demuxer)) != 0) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
745 if (fformat == demuxer_desc->type) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
746 demuxer_t *demux2 = demuxer;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
747 mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_Detected_XXX_FileFormat, demuxer_desc->shortdesc);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
748 file_format = fformat;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
749 if (!demuxer->desc->open || (demux2 = demuxer->desc->open(demuxer))) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
750 demuxer = demux2;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
751 goto dmx_open;
26379
fa8997230d4e Reformat demuxer.c
uau
parents: 26378
diff changeset
752 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
753 } else {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
754 if (fformat == DEMUXER_TYPE_PLAYLIST)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
755 return demuxer; // handled in mplayer.c
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
756 // Format changed after check, recurse
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
757 free_demuxer(demuxer);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
758 demuxer=demux_open_stream(stream, fformat, force,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
759 audio_id, video_id, dvdsub_id, filename);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
760 if(demuxer) return demuxer; // done!
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
761 file_format = DEMUXER_TYPE_UNKNOWN;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
762 }
26379
fa8997230d4e Reformat demuxer.c
uau
parents: 26378
diff changeset
763 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
764 free_demuxer(demuxer);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
765 demuxer = NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
766 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
767 }
9006
d00997f12257 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents: 8937
diff changeset
768
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
769 // If no forced demuxer perform file extension based detection
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
770 // Ok. We're over the stable detectable fileformats, the next ones are a bit
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
771 // fuzzy. So by default (extension_parsing==1) try extension-based detection
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
772 // first:
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
773 if(file_format==DEMUXER_TYPE_UNKNOWN && filename && extension_parsing==1){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
774 file_format=demuxer_type_by_filename(filename);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
775 if(file_format!=DEMUXER_TYPE_UNKNOWN){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
776 // we like recursion :)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
777 demuxer=demux_open_stream(stream, file_format, force,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
778 audio_id, video_id, dvdsub_id, filename);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
779 if(demuxer) return demuxer; // done!
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
780 file_format=DEMUXER_TYPE_UNKNOWN; // continue fuzzy guessing...
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
781 mp_msg(MSGT_DEMUXER,MSGL_V,"demuxer: continue fuzzy content-based format guessing...\n");
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
782 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
783 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
784
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
785 // Try detection for all other demuxers
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
786 for (i = 0; (demuxer_desc = demuxer_list[i]); i++) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
787 if (!demuxer_desc->safe_check && demuxer_desc->check_file) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
788 demuxer = new_demuxer(stream,demuxer_desc->type,audio_id,video_id,dvdsub_id,filename);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
789 if ((fformat = demuxer_desc->check_file(demuxer)) != 0) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
790 if (fformat == demuxer_desc->type) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
791 demuxer_t *demux2 = demuxer;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
792 mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_Detected_XXX_FileFormat, demuxer_desc->shortdesc);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
793 file_format = fformat;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
794 if (!demuxer->desc->open || (demux2 = demuxer->desc->open(demuxer))) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
795 demuxer = demux2;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
796 goto dmx_open;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
797 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
798 } else {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
799 if (fformat == DEMUXER_TYPE_PLAYLIST)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
800 return demuxer; // handled in mplayer.c
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
801 // Format changed after check, recurse
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
802 free_demuxer(demuxer);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
803 demuxer=demux_open_stream(stream, fformat, force,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
804 audio_id, video_id, dvdsub_id, filename);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
805 if(demuxer) return demuxer; // done!
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
806 file_format = DEMUXER_TYPE_UNKNOWN;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
807 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
808 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
809 free_demuxer(demuxer);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
810 demuxer = NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
811 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
812 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
813
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
814 return NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
815 //====== File format recognized, set up these for compatibility: =========
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
816 dmx_open:
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
817
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
818 demuxer->file_format=file_format;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
819
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
820 if ((sh_video=demuxer->video->sh) && sh_video->bih){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
821 int biComp=le2me_32(sh_video->bih->biCompression);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
822 mp_msg(MSGT_DEMUX,MSGL_INFO,"VIDEO: [%.4s] %dx%d %dbpp %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n",
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
823 (char *)&biComp,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
824 sh_video->bih->biWidth,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
825 sh_video->bih->biHeight,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
826 sh_video->bih->biBitCount,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
827 sh_video->fps,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
828 sh_video->i_bps*0.008f,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
829 sh_video->i_bps/1024.0f );
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
830 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
831 #ifdef USE_ASS
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
832 if (ass_enabled && ass_library) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
833 for (i = 0; i < MAX_S_STREAMS; ++i) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
834 sh_sub_t* sh = demuxer->s_streams[i];
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
835 if (sh && sh->type == 'a') {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
836 sh->ass_track = ass_new_track(ass_library);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
837 if (sh->ass_track && sh->extradata)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
838 ass_process_codec_private(sh->ass_track, sh->extradata, sh->extradata_len);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
839 } else if (sh && sh->type != 'v')
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
840 sh->ass_track = ass_default_track(ass_library);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
841 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
842 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
843 #endif
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
844 return demuxer;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
845 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
846
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
847 char* audio_stream = NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
848 char* sub_stream = NULL;
9709
1b1e33d1688a Fix rawvideo and -audiofile
albeu
parents: 9610
diff changeset
849 int audio_stream_cache = 0;
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7754
diff changeset
850
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
851 char *demuxer_name = NULL; // parameter from -demuxer
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
852 char *audio_demuxer_name = NULL; // parameter from -audio-demuxer
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
853 char *sub_demuxer_name = NULL; // parameter from -sub-demuxer
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
854
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7754
diff changeset
855 extern int hr_mp3_seek;
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
856
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 12434
diff changeset
857 extern float stream_cache_min_percent;
16152
10a69a812eff remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents: 15958
diff changeset
858 extern float stream_cache_seek_min_percent;
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 12434
diff changeset
859
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
860 demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int dvdsub_id,char* filename){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
861 stream_t *as = NULL,*ss = NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
862 demuxer_t *vd,*ad = NULL,*sd = NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
863 demuxer_t *res;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
864 int afmt =DEMUXER_TYPE_UNKNOWN,sfmt = DEMUXER_TYPE_UNKNOWN ;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
865 int demuxer_type;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
866 int audio_demuxer_type = 0, sub_demuxer_type = 0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
867 int demuxer_force = 0, audio_demuxer_force = 0,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
868 sub_demuxer_force = 0;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
869
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
870 if ((demuxer_type = get_demuxer_type_from_name(demuxer_name, &demuxer_force)) < 0) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
871 mp_msg(MSGT_DEMUXER,MSGL_ERR,"-demuxer %s does not exist.\n",demuxer_name);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
872 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
873 if ((audio_demuxer_type = get_demuxer_type_from_name(audio_demuxer_name, &audio_demuxer_force)) < 0) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
874 mp_msg(MSGT_DEMUXER,MSGL_ERR,"-audio-demuxer %s does not exist.\n",audio_demuxer_name);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
875 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
876 if ((sub_demuxer_type = get_demuxer_type_from_name(sub_demuxer_name, &sub_demuxer_force)) < 0) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
877 mp_msg(MSGT_DEMUXER,MSGL_ERR,"-sub-demuxer %s does not exist.\n",sub_demuxer_name);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
878 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
879
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
880 if(audio_stream) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
881 as = open_stream(audio_stream,0,&afmt);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
882 if(!as) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
883 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_CannotOpenAudioStream,audio_stream);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
884 return NULL;
26379
fa8997230d4e Reformat demuxer.c
uau
parents: 26378
diff changeset
885 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
886 if(audio_stream_cache) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
887 if(!stream_enable_cache(as,audio_stream_cache*1024,audio_stream_cache*1024*(stream_cache_min_percent / 100.0),
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
888 audio_stream_cache*1024*(stream_cache_seek_min_percent / 100.0))) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
889 free_stream(as);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
890 mp_msg(MSGT_DEMUXER,MSGL_ERR,"Can't enable audio stream cache\n");
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
891 return NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
892 }
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
893 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
894 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
895 if(sub_stream) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
896 ss = open_stream(sub_stream,0,&sfmt);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
897 if(!ss) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
898 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_CannotOpenSubtitlesStream,sub_stream);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
899 return NULL;
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
900 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
901 }
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
902
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
903 vd = demux_open_stream(vs, demuxer_type ? demuxer_type : file_format,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
904 demuxer_force, audio_stream ? -2 : audio_id, video_id,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
905 sub_stream ? -2 : dvdsub_id, filename);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
906 if(!vd) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
907 if(as) free_stream(as);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
908 if(ss) free_stream(ss);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
909 return NULL;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
910 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
911 if(as) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
912 ad = demux_open_stream(as, audio_demuxer_type ? audio_demuxer_type : afmt,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
913 audio_demuxer_force, audio_id, -2, -2, audio_stream);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
914 if(!ad) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
915 mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_OpeningAudioDemuxerFailed,audio_stream);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
916 free_stream(as);
9709
1b1e33d1688a Fix rawvideo and -audiofile
albeu
parents: 9610
diff changeset
917 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
918 else if(ad->audio->sh && ((sh_audio_t*)ad->audio->sh)->format == 0x55) // MP3
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
919 hr_mp3_seek=1; // Enable high res seeking
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
920 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
921 if(ss) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
922 sd = demux_open_stream(ss, sub_demuxer_type ? sub_demuxer_type : sfmt,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
923 sub_demuxer_force, -2, -2, dvdsub_id, sub_stream);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
924 if(!sd) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
925 mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_OpeningSubtitlesDemuxerFailed,sub_stream);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
926 free_stream(ss);
9709
1b1e33d1688a Fix rawvideo and -audiofile
albeu
parents: 9610
diff changeset
927 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
928 }
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
929
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
930 if(ad && sd)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
931 res = new_demuxers_demuxer(vd,ad,sd);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
932 else if(ad)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
933 res = new_demuxers_demuxer(vd,ad,vd);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
934 else if(sd)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
935 res = new_demuxers_demuxer(vd,vd,sd);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
936 else
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
937 res = vd;
25919
382672c7480a Allow demuxers to choose a default value for correct_pts
reimar
parents: 25883
diff changeset
938
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
939 correct_pts = user_correct_pts;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
940 if (correct_pts < 0)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
941 correct_pts = demux_control(res, DEMUXER_CTRL_CORRECT_PTS, NULL) == DEMUXER_CTRL_OK;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
942 return res;
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
943 }
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
944
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
945
26926
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
946 void demux_flush(demuxer_t *demuxer) {
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
947 ds_free_packs(demuxer->video);
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
948 ds_free_packs(demuxer->audio);
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
949 ds_free_packs(demuxer->sub);
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
950 }
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
951
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
952 int demux_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
953 demux_stream_t *d_audio=demuxer->audio;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
954 demux_stream_t *d_video=demuxer->video;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
955 sh_audio_t *sh_audio=d_audio->sh;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
956 sh_video_t *sh_video=d_video->sh;
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
957 double tmp = 0;
20748
865b71a83296 now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents: 20319
diff changeset
958 double pts;
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
959
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
960 if(!demuxer->seekable){
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
961 if(demuxer->file_format==DEMUXER_TYPE_AVI)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
962 mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_CantSeekRawAVI);
2790
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
963 #ifdef USE_TV
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
964 else if (demuxer->file_format==DEMUXER_TYPE_TV)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
965 mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_TVInputNotSeekable);
2790
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
966 #endif
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
967 else
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
968 mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_CantSeekFile);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
969 return 0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
970 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
971
26926
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
972 demux_flush(demuxer);
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
973 // clear demux buffers:
26926
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
974 if(sh_audio) sh_audio->a_buffer_len=0;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
975 demuxer->stream->eof=0; // clear eof flag
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
976 demuxer->video->eof=0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
977 demuxer->audio->eof=0;
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
978
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
979 #if 0
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
980 if(sh_audio) sh_audio->timer=sh_video->timer;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
981 #else
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
982 if(sh_video) sh_video->timer=0; // !!!!!!
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
983 #endif
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
984
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
985 if(flags & SEEK_ABSOLUTE)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
986 pts = 0.0f;
20748
865b71a83296 now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents: 20319
diff changeset
987 else {
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
988 if(demuxer->stream_pts == MP_NOPTS_VALUE)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
989 goto dmx_seek;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
990 pts = demuxer->stream_pts;
20748
865b71a83296 now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents: 20319
diff changeset
991 }
865b71a83296 now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents: 20319
diff changeset
992
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
993 if(flags & SEEK_FACTOR) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
994 if(stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, &tmp) == STREAM_UNSUPPORTED)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
995 goto dmx_seek;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
996 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
997 } else
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
998 pts += rel_seek_secs;
20748
865b71a83296 now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents: 20319
diff changeset
999
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1000 if(stream_control(demuxer->stream, STREAM_CTRL_SEEK_TO_TIME, &pts) != STREAM_UNSUPPORTED) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1001 demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1002 return 1;
20748
865b71a83296 now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents: 20319
diff changeset
1003 }
865b71a83296 now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents: 20319
diff changeset
1004
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1005 dmx_seek:
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1006 if (demuxer->desc->seek)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1007 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
1008
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1009 if (sh_audio) resync_audio_stream(sh_audio);
16877
9081ae3a702c move resync_audio_stream after seeking to demuxer.c
reimar
parents: 16572
diff changeset
1010
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1011 return 1;
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
1012 }
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
1013
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
1014 int demux_info_add(demuxer_t *demuxer, const char *opt, const char *param)
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1015 {
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4660
diff changeset
1016 char **info = demuxer->info;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4660
diff changeset
1017 int n = 0;
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
1018
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1019
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1020 for(n = 0; info && info[2*n] != NULL; n++)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1021 {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1022 if(!strcasecmp(opt,info[2*n]))
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1023 {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1024 mp_msg(MSGT_DEMUX, MSGL_INFO,MSGTR_DemuxerInfoChanged,opt,param);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1025 free(info[2*n+1]);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1026 info[2*n+1] = strdup(param);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1027 return 0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1028 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1029 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1030
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1031 info = demuxer->info = (char**)realloc(info,(2*(n+2))*sizeof(char*));
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1032 info[2*n] = strdup(opt);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1033 info[2*n+1] = strdup(param);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1034 memset(&info[2*(n+1)],0,2*sizeof(char*));
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1035
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4660
diff changeset
1036 return 1;
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1037 }
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1038
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1039 int demux_info_print(demuxer_t *demuxer)
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1040 {
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4660
diff changeset
1041 char **info = demuxer->info;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4660
diff changeset
1042 int n;
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1043
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1044 if(!info)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1045 return 0;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4660
diff changeset
1046
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1047 mp_msg(MSGT_DEMUX, MSGL_INFO,MSGTR_ClipInfo);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1048 for(n = 0; info[2*n] != NULL ; n++)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1049 {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1050 mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n",info[2*n],info[2*n+1]);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1051 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_NAME%d=%s\n", n, info[2*n]);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1052 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_VALUE%d=%s\n", n, 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
1053 }
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
1054 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
1055
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
1056 return 0;
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
1057 }
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
1058
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1059 char* demux_info_get(demuxer_t *demuxer, const char *opt) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1060 int i;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1061 char **info = demuxer->info;
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
1062
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1063 for(i = 0; info && info[2*i] != NULL; i++) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1064 if(!strcasecmp(opt,info[2*i]))
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1065 return info[2*i+1];
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1066 }
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
1067
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1068 return NULL;
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
1069 }
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4735
diff changeset
1070
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1071 int demux_control(demuxer_t *demuxer, int cmd, void *arg) {
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1072
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
1073 if (demuxer->desc->control)
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1074 return demuxer->desc->control(demuxer,cmd,arg);
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
1075
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
1076 return DEMUXER_CTRL_NOTIMPL;
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1077 }
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1078
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1079
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1080
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1081 double demuxer_get_time_length(demuxer_t *demuxer){
16346
6ff303d2876b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents: 16326
diff changeset
1082 double get_time_ans;
14502
8769fa370f83 Move generic length and percent pos calculation to demuxer.c
reimar
parents: 14276
diff changeset
1083 sh_video_t *sh_video = demuxer->video->sh;
16925
4bce034eeb0a estimate total time also for audio-only files.
reimar
parents: 16877
diff changeset
1084 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
1085 // <= 0 means DEMUXER_CTRL_NOTIMPL or DEMUXER_CTRL_DONTKNOW
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1086 if (demux_control(demuxer, DEMUXER_CTRL_GET_TIME_LENGTH,(void *)&get_time_ans)<=0) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1087 if (sh_video && sh_video->i_bps && sh_audio && sh_audio->i_bps)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1088 get_time_ans = (double)(demuxer->movi_end-demuxer->movi_start)/(sh_video->i_bps+sh_audio->i_bps);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1089 else if (sh_video && sh_video->i_bps)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1090 get_time_ans = (double)(demuxer->movi_end-demuxer->movi_start)/sh_video->i_bps;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1091 else if (sh_audio && sh_audio->i_bps)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1092 get_time_ans = (double)(demuxer->movi_end-demuxer->movi_start)/sh_audio->i_bps;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1093 else
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1094 get_time_ans=0;
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1095 }
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1096 return get_time_ans;
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1097 }
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1098
20749
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1099 /**
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1100 * \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
1101 * 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
1102 * 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
1103 * 0 otherwise
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1104 * \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
1105 */
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1106 int demuxer_get_current_time(demuxer_t *demuxer){
20749
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1107 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
1108 sh_video_t *sh_video = demuxer->video->sh;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1109 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
1110 get_time_ans = demuxer->stream_pts;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1111 else if(sh_video) 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
1112 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
1113 }
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20748
diff changeset
1114
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1115 int demuxer_get_percent_pos(demuxer_t *demuxer){
14197
2ae224195625 Use demuxer_get_percent_pos for the OSD position bar
reimar
parents: 14160
diff changeset
1116 int ans = 0;
2ae224195625 Use demuxer_get_percent_pos for the OSD position bar
reimar
parents: 14160
diff changeset
1117 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
1118 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
1119 if (res <= 0) {
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1120 if (len > 0)
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1121 ans = (demuxer->filepos - demuxer->movi_start) / len;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1122 else
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1123 ans = 0;
14502
8769fa370f83 Move generic length and percent pos calculation to demuxer.c
reimar
parents: 14276
diff changeset
1124 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1125 if (ans < 0) ans = 0;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1126 if (ans > 100) ans = 100;
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1127 return ans;
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1128 }
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8123
diff changeset
1129
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1130 int demuxer_switch_audio(demuxer_t *demuxer, int index){
15285
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
1131 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
1132 if (res == DEMUXER_CTRL_NOTIMPL)
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1133 index = demuxer->audio->id;
26089
e2f35d90ad39 Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents: 26088
diff changeset
1134 if (demuxer->audio->id >= 0)
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1135 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
1136 else
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1137 demuxer->audio->sh = NULL;
15285
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15046
diff changeset
1138 return index;
15046
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14934
diff changeset
1139 }
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1140
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1141 int demuxer_switch_video(demuxer_t *demuxer, int index){
20948
7c91b80cabc1 added code to switch video stream
nicodvb
parents: 20872
diff changeset
1142 int res = demux_control(demuxer, DEMUXER_CTRL_SWITCH_VIDEO, &index);
7c91b80cabc1 added code to switch video stream
nicodvb
parents: 20872
diff changeset
1143 if (res == DEMUXER_CTRL_NOTIMPL)
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1144 index = demuxer->video->id;
26089
e2f35d90ad39 Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents: 26088
diff changeset
1145 if (demuxer->video->id >= 0)
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1146 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
1147 else
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1148 demuxer->video->sh = NULL;
20948
7c91b80cabc1 added code to switch video stream
nicodvb
parents: 20872
diff changeset
1149 return index;
7c91b80cabc1 added code to switch video stream
nicodvb
parents: 20872
diff changeset
1150 }
7c91b80cabc1 added code to switch video stream
nicodvb
parents: 20872
diff changeset
1151
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1152 int demuxer_add_attachment(demuxer_t* demuxer, const char* name,
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1153 const char* type, const void* data, size_t size) {
25657
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1154 if (!(demuxer->num_attachments & 31))
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1155 demuxer->attachments = realloc(demuxer->attachments, (demuxer->num_attachments + 32) * sizeof(demux_attachment_t));
25657
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1156
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1157 demuxer->attachments[demuxer->num_attachments].name = strdup(name);
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1158 demuxer->attachments[demuxer->num_attachments].type = strdup(type);
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1159 demuxer->attachments[demuxer->num_attachments].data = malloc(size);
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1160 memcpy(demuxer->attachments[demuxer->num_attachments].data, data, size);
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1161 demuxer->attachments[demuxer->num_attachments].data_size = size;
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1162
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1163 return demuxer->num_attachments ++;
25657
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1164 }
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25656
diff changeset
1165
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1166 int demuxer_add_chapter(demuxer_t* demuxer, const char* name, uint64_t start, uint64_t end){
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1167 if (demuxer->chapters == NULL)
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1168 demuxer->chapters = malloc (32*sizeof(*demuxer->chapters));
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1169 else if (!(demuxer->num_chapters % 32))
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1170 demuxer->chapters = realloc (demuxer->chapters, (demuxer->num_chapters + 32) * sizeof(*demuxer->chapters));
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1171
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1172 demuxer->chapters[demuxer->num_chapters].start = start;
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1173 demuxer->chapters[demuxer->num_chapters].end = end;
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1174 demuxer->chapters[demuxer->num_chapters].name = strdup(name);
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1175
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1176 return demuxer->num_chapters ++;
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1177 }
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
1178
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1179 /**
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1180 * \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
1181 * either using the demuxer->chapters structure set by the demuxer
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1182 * or asking help to the stream layer (e.g. dvd)
19439
28d2d1fddff4 clarification in a comment
nicodvb
parents: 19438
diff changeset
1183 * \param chapter - chapter number wished - 0-based
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1184 * \param mode 0: relative to current main pts, 1: absolute
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1185 * \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
1186 * \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
1187 * \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
1188 * \return -1 on error, current chapter if successful
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1189 */
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1190
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1191 int demuxer_seek_chapter(demuxer_t *demuxer, int chapter, int mode, float *seek_pts, int *num_chapters, char **chapter_name) {
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1192 int ris;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1193 int current, total;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1194 sh_video_t *sh_video = demuxer->video->sh;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1195 sh_audio_t *sh_audio = demuxer->audio->sh;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1196
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1197 if (!demuxer->num_chapters || !demuxer->chapters) {
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1198 if(!mode) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1199 ris = stream_control(demuxer->stream, STREAM_CTRL_GET_CURRENT_CHAPTER, &current);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1200 if(ris == STREAM_UNSUPPORTED) return -1;
19438
263e95c47aec support relative seeking in the stream-driven case
nicodvb
parents: 19435
diff changeset
1201 chapter += current;
263e95c47aec support relative seeking in the stream-driven case
nicodvb
parents: 19435
diff changeset
1202 }
263e95c47aec support relative seeking in the stream-driven case
nicodvb
parents: 19435
diff changeset
1203
26926
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
1204 demux_flush(demuxer);
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1205
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1206 ris = stream_control(demuxer->stream, STREAM_CTRL_SEEK_TO_CHAPTER, &chapter);
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1207 if(ris != STREAM_UNSUPPORTED)
20839
950ea3171afc in demux_seek() if STREAM_CTRL_SEEK_TO_CHAPTER suceeds call DEMUXER_CTRL_RESYNC to notify the demuxer of the change
nicodvb
parents: 20749
diff changeset
1208 demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL);
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1209 if(sh_video) {
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1210 ds_fill_buffer(demuxer->video);
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1211 resync_video_stream(sh_video);
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1212 }
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1213
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1214 if(sh_audio) {
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1215 ds_fill_buffer(demuxer->audio);
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1216 resync_audio_stream(sh_audio);
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1217 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1218
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1219 //exit status may be ok, but main() doesn't have to seek itself (because e.g. dvds depend on sectors, not on pts)
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1220 *seek_pts = -1.0;
19478
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1221
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1222 if(num_chapters) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1223 if(stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, num_chapters) == STREAM_UNSUPPORTED)
19478
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1224 *num_chapters = 0;
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1225 }
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1226
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1227 if(chapter_name) {
19478
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1228 *chapter_name = NULL;
25314
02e2e7a5599a Fix memory leak that tmp allocated but maybe not used.
ulion
parents: 25266
diff changeset
1229 if (num_chapters && *num_chapters) {
02e2e7a5599a Fix memory leak that tmp allocated but maybe not used.
ulion
parents: 25266
diff changeset
1230 char *tmp = malloc(16);
02e2e7a5599a Fix memory leak that tmp allocated but maybe not used.
ulion
parents: 25266
diff changeset
1231 if (tmp) {
02e2e7a5599a Fix memory leak that tmp allocated but maybe not used.
ulion
parents: 25266
diff changeset
1232 sprintf(tmp, " of %3d", *num_chapters);
02e2e7a5599a Fix memory leak that tmp allocated but maybe not used.
ulion
parents: 25266
diff changeset
1233 *chapter_name = tmp;
02e2e7a5599a Fix memory leak that tmp allocated but maybe not used.
ulion
parents: 25266
diff changeset
1234 }
19478
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1235 }
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1236 }
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1237
26758
9fb1d2c3dbd4 cosmetics: Remove pointless parentheses from return statements.
diego
parents: 26437
diff changeset
1238 return ris != STREAM_UNSUPPORTED ? chapter : -1;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1239 } else { //chapters structure is set in the demuxer
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1240 total = demuxer->num_chapters;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1241
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1242 if (mode==1) { //absolute seeking
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1243 current = chapter;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1244 } else { //relative seeking
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1245 uint64_t now;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1246 now = (sh_video ? sh_video->pts : (sh_audio ? sh_audio->pts : 0.)) * 1000 + .5;
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1247
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1248 for (current = total - 1; current >= 0; --current) {
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1249 demux_chapter_t* chapter = demuxer->chapters + current;
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1250 if (chapter->start <= now)
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1251 break;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1252 }
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1253 current += chapter;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1254 }
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1255
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1256 if (current >= total)
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1257 return -1;
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1258 if (current < 0) current = 0;
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1259
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1260 *seek_pts = demuxer->chapters[current].start / 1000.0;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1261
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1262 if(num_chapters)
19478
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1263 *num_chapters = demuxer->num_chapters;
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1264
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1265 if(chapter_name) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1266 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
1267 *chapter_name = strdup(demuxer->chapters[current].name);
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1268 else *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
1269 }
19478
bab82c53e433 demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents: 19439
diff changeset
1270
19435
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1271 return current;
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1272 }
7bddb8ee9dec added first revision of demuxer_seek_chapter()
nicodvb
parents: 19413
diff changeset
1273 }
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1274
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1275 int demuxer_get_current_chapter(demuxer_t *demuxer) {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1276 int chapter = -1;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1277 if (!demuxer->num_chapters || !demuxer->chapters) {
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1278 if (stream_control(demuxer->stream, STREAM_CTRL_GET_CURRENT_CHAPTER,
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1279 &chapter) == STREAM_UNSUPPORTED)
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1280 chapter = -1;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1281 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1282 else {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1283 sh_video_t *sh_video = demuxer->video->sh;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1284 sh_audio_t *sh_audio = demuxer->audio->sh;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1285 uint64_t now;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1286 now = (sh_video ? sh_video->pts : (sh_audio?sh_audio->pts:0))*1000+0.5;
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1287 for (chapter = demuxer->num_chapters - 1; chapter >= 0; --chapter) {
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1288 if (demuxer->chapters[chapter].start <= now)
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1289 break;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1290 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1291 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1292 return chapter;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1293 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1294
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1295 char *demuxer_chapter_name(demuxer_t *demuxer, int chapter) {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1296 if (demuxer->num_chapters && demuxer->chapters) {
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1297 if (chapter >=0 && chapter < demuxer->num_chapters &&
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1298 demuxer->chapters[chapter].name)
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1299 return strdup(demuxer->chapters[chapter].name);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1300 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1301 return NULL;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1302 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1303
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1304 char *demuxer_chapter_display_name(demuxer_t *demuxer, int chapter) {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1305 char *chapter_name = demuxer_chapter_name(demuxer, chapter);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1306 if (chapter_name) {
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1307 char *tmp = malloc(strlen(chapter_name) + 14);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1308 snprintf(tmp, 63, "(%d) %s", chapter + 1, chapter_name);
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1309 free(chapter_name);
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1310 return tmp;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1311 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1312 else {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1313 int chapter_num = demuxer_chapter_count(demuxer);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1314 char tmp[30];
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1315 if (chapter_num <= 0)
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1316 sprintf(tmp, "(%d)", chapter + 1);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1317 else
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1318 sprintf(tmp, "(%d) of %d", chapter + 1, chapter_num);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1319 return strdup(tmp);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1320 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1321 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1322
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1323 float demuxer_chapter_time(demuxer_t *demuxer, int chapter, float *end) {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1324 if (demuxer->num_chapters && demuxer->chapters && chapter >= 0
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1325 && chapter < demuxer->num_chapters) {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1326 if (end)
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1327 *end = demuxer->chapters[chapter].end / 1000.0;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1328 return demuxer->chapters[chapter].start / 1000.0;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1329 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1330 return -1.0;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1331 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1332
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1333 int demuxer_chapter_count(demuxer_t *demuxer) {
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1334 if (!demuxer->num_chapters || !demuxer->chapters) {
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1335 int num_chapters = 0;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1336 if (stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS,
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1337 &num_chapters) == STREAM_UNSUPPORTED)
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1338 num_chapters = 0;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1339 return num_chapters;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1340 }
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1341 else
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1342 return demuxer->num_chapters;
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1343 }
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25314
diff changeset
1344
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1345 int demuxer_angles_count(demuxer_t *demuxer) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1346 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
1347
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
1348 ris = stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_ANGLES, &angles);
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1349 if(ris == STREAM_UNSUPPORTED) 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
1350 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
1351 }
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
1352
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1353 int demuxer_get_current_angle(demuxer_t *demuxer) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1354 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
1355 ris = stream_control(demuxer->stream, STREAM_CTRL_GET_ANGLE, &curr_angle);
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1356 if(ris == STREAM_UNSUPPORTED) 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
1357 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
1358 }
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
1359
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
1360
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1361 int demuxer_set_angle(demuxer_t *demuxer, int angle) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1362 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
1363 sh_video_t *sh_video = demuxer->video->sh;
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
1364 sh_audio_t *sh_audio = demuxer->audio->sh;
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
1365
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
1366 angles = demuxer_angles_count(demuxer);
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1367 if((angles < 1) || (angle > angles)) 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
1368
26926
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26876
diff changeset
1369 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
1370
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
1371 ris = stream_control(demuxer->stream, STREAM_CTRL_SET_ANGLE, &angle);
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1372 if(ris == STREAM_UNSUPPORTED) 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
1373
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
1374 demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL);
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1375 if(sh_video) {
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
1376 ds_fill_buffer(demuxer->video);
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
1377 resync_video_stream(sh_video);
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
1378 }
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
1379
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1380 if(sh_audio) {
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
1381 ds_fill_buffer(demuxer->audio);
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
1382 resync_audio_stream(sh_audio);
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
1383 }
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
1384
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
1385 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
1386 }
26086
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1387
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1388 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
1389 {
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1390 int i, len;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1391 lang += strspn(lang, ",");
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1392 while((len = strcspn(lang, ",")) > 0) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1393 for (i=0; i < MAX_A_STREAMS; ++i) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1394 sh_audio_t* sh = d->a_streams[i];
26086
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1395 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
1396 return sh->aid;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1397 }
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1398 lang += len;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1399 lang += strspn(lang, ",");
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1400 }
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1401 return -1;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1402 }
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1403
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1404 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
1405 {
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1406 int i, len;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1407 lang += strspn(lang, ",");
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1408 while((len = strcspn(lang, ",")) > 0) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1409 for (i=0; i < MAX_S_STREAMS; ++i) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1410 sh_sub_t* sh = d->s_streams[i];
26086
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1411 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
1412 return sh->sid;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1413 }
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1414 lang += len;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1415 lang += strspn(lang, ",");
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1416 }
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1417 return -1;
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26085
diff changeset
1418 }
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1419
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1420 int demuxer_default_audio_track(demuxer_t* d)
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1421 {
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1422 int i;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1423 for (i=0; i < MAX_A_STREAMS; ++i) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1424 sh_audio_t* sh = d->a_streams[i];
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1425 if (sh && sh->default_track)
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1426 return sh->aid;
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1427 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1428 for (i=0; i < MAX_A_STREAMS; ++i) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1429 sh_audio_t* sh = d->a_streams[i];
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1430 if (sh)
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1431 return sh->aid;
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1432 }
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1433 return -1;
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1434 }
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1435
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1436 int demuxer_default_sub_track(demuxer_t* d)
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1437 {
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1438 int i;
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1439 for (i=0; i < MAX_S_STREAMS; ++i) {
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1440 sh_sub_t* sh = d->s_streams[i];
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1441 if (sh && sh->default_track)
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1442 return sh->sid;
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1443 }
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1444 return -1;
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26089
diff changeset
1445 }
26437
2735c113ed62 Revert r26411: policy violation
rtogni
parents: 26379
diff changeset
1446