Mercurial > mplayer.hg
annotate libmpdemux/demux_nut.c @ 28507:280590cf5c40
Remove several #ifdefs that check for libavcodec features from vd_ffmpeg.
They make no sense since only recent libavcodec versions are supported anyway.
author | reimar |
---|---|
date | Thu, 12 Feb 2009 15:35:18 +0000 |
parents | 231f008859b9 |
children | d643e4643313 |
rev | line source |
---|---|
19861 | 1 #include <stdio.h> |
20815 | 2 #include <stdlib.h> |
19861 | 3 |
4 #include "config.h" | |
5 #include "mp_msg.h" | |
6 | |
23084 | 7 #include "help_mp.h" |
8 | |
22605
4d81dbdf46b9
Add explicit location for headers from the stream/ directory.
diego
parents:
22484
diff
changeset
|
9 #include "stream/stream.h" |
19861 | 10 #include "demuxer.h" |
11 #include "stheader.h" | |
12 | |
20893 | 13 #include <libnut.h> |
19861 | 14 |
15 typedef struct { | |
16 int last_pts; // FIXME | |
28099
3d88e7067d06
Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut API
ods15
parents:
27730
diff
changeset
|
17 nut_context_tt * nut; |
3d88e7067d06
Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut API
ods15
parents:
27730
diff
changeset
|
18 nut_stream_header_tt * s; |
3d88e7067d06
Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut API
ods15
parents:
27730
diff
changeset
|
19 } nut_priv_tt; |
19861 | 20 |
21 static size_t mp_read(void * h, size_t len, uint8_t * buf) { | |
22 stream_t * stream = (stream_t*)h; | |
23 | |
24 if(stream_eof(stream)) return 0; | |
21022 | 25 //len = MIN(len, 5); |
19861 | 26 |
27 return stream_read(stream, buf, len); | |
28 } | |
29 | |
21022 | 30 static int mp_eof(void * h) { |
31 stream_t * stream = (stream_t*)h; | |
32 if(stream_eof(stream)) return 1; | |
33 return 0; | |
34 } | |
35 | |
19861 | 36 static off_t mp_seek(void * h, long long pos, int whence) { |
37 stream_t * stream = (stream_t*)h; | |
38 | |
39 if (stream->end_pos < stream_tell(stream)) | |
40 stream->end_pos = stream_tell(stream); | |
41 | |
42 if (whence == SEEK_CUR) pos += stream_tell(stream); | |
43 else if (whence == SEEK_END) pos += stream->end_pos; | |
44 else if (whence != SEEK_SET) return -1; | |
45 | |
46 if (pos < stream->end_pos && stream->eof) stream_reset(stream); | |
47 if (stream_seek(stream, pos) == 0) return -1; | |
48 | |
49 return pos; | |
50 } | |
51 | |
52 #define ID_STRING "nut/multimedia container" | |
53 #define ID_LENGTH (strlen(ID_STRING) + 1) | |
54 | |
55 static int nut_check_file(demuxer_t * demuxer) { | |
56 uint8_t buf[ID_LENGTH]; | |
57 | |
58 if (stream_read(demuxer->stream, buf, ID_LENGTH) != ID_LENGTH) return 0; | |
59 | |
60 if (memcmp(buf, ID_STRING, ID_LENGTH)) return 0; | |
61 | |
62 stream_seek(demuxer->stream, 0); | |
63 return DEMUXER_TYPE_NUT; | |
64 } | |
65 | |
66 static demuxer_t * demux_open_nut(demuxer_t * demuxer) { | |
28099
3d88e7067d06
Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut API
ods15
parents:
27730
diff
changeset
|
67 nut_demuxer_opts_tt dopts = { |
19861 | 68 .input = { |
69 .priv = demuxer->stream, | |
70 .seek = mp_seek, | |
71 .read = mp_read, | |
21022 | 72 .eof = mp_eof, |
19861 | 73 .file_pos = stream_tell(demuxer->stream), |
74 }, | |
19957 | 75 .alloc = { .malloc = NULL }, |
20909 | 76 .read_index = index_mode, |
77 .cache_syncpoints = 1, | |
19861 | 78 }; |
28099
3d88e7067d06
Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut API
ods15
parents:
27730
diff
changeset
|
79 nut_priv_tt * priv = demuxer->priv = calloc(1, sizeof(nut_priv_tt)); |
3d88e7067d06
Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut API
ods15
parents:
27730
diff
changeset
|
80 nut_context_tt * nut = priv->nut = nut_demuxer_init(&dopts); |
3d88e7067d06
Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut API
ods15
parents:
27730
diff
changeset
|
81 nut_stream_header_tt * s; |
19861 | 82 int ret; |
83 int i; | |
84 | |
21022 | 85 while ((ret = nut_read_headers(nut, &s, NULL)) == NUT_ERR_EAGAIN); |
86 if (ret) { | |
20938 | 87 mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", nut_error(ret)); |
19861 | 88 return NULL; |
89 } | |
90 | |
91 priv->s = s; | |
92 | |
93 for (i = 0; s[i].type != -1 && i < 2; i++) switch(s[i].type) { | |
94 case NUT_AUDIO_CLASS: { | |
95 WAVEFORMATEX *wf = | |
96 calloc(sizeof(WAVEFORMATEX) + | |
97 s[i].codec_specific_len, 1); | |
98 sh_audio_t* sh_audio = new_sh_audio(demuxer, i); | |
28101 | 99 int j; |
23010
74efb0fa8a0b
with -identify show audio and video id; patch by Andrew Savchenko (Bircoph list ru)
nicodvb
parents:
22605
diff
changeset
|
100 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "nut", i); |
19861 | 101 |
102 sh_audio->wf= wf; sh_audio->ds = demuxer->audio; | |
103 sh_audio->audio.dwSampleSize = 0; // FIXME | |
21723 | 104 sh_audio->audio.dwScale = s[i].time_base.num; |
19861 | 105 sh_audio->audio.dwRate = s[i].time_base.den; |
106 sh_audio->format = 0; | |
107 for (j = 0; j < s[i].fourcc_len && j < 4; j++) | |
108 sh_audio->format |= s[i].fourcc[j]<<(j*8); | |
109 sh_audio->channels = s[i].channel_count; | |
110 sh_audio->samplerate = | |
21723 | 111 s[i].samplerate_num / s[i].samplerate_denom; |
19861 | 112 sh_audio->i_bps = 0; // FIXME |
113 | |
114 wf->wFormatTag = sh_audio->format; | |
115 wf->nChannels = s[i].channel_count; | |
116 wf->nSamplesPerSec = | |
21723 | 117 s[i].samplerate_num / s[i].samplerate_denom; |
19861 | 118 wf->nAvgBytesPerSec = 0; // FIXME |
119 wf->nBlockAlign = 0; // FIXME | |
120 wf->wBitsPerSample = 0; // FIXME | |
121 wf->cbSize = s[i].codec_specific_len; | |
122 if (s[i].codec_specific_len) | |
123 memcpy(wf + 1, s[i].codec_specific, | |
124 s[i].codec_specific_len); | |
125 | |
126 demuxer->audio->id = i; | |
127 demuxer->audio->sh= demuxer->a_streams[i]; | |
128 break; | |
129 } | |
130 case NUT_VIDEO_CLASS: { | |
131 BITMAPINFOHEADER * bih = | |
132 calloc(sizeof(BITMAPINFOHEADER) + | |
133 s[i].codec_specific_len, 1); | |
134 sh_video_t * sh_video = new_sh_video(demuxer, i); | |
28101 | 135 int j; |
23010
74efb0fa8a0b
with -identify show audio and video id; patch by Andrew Savchenko (Bircoph list ru)
nicodvb
parents:
22605
diff
changeset
|
136 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "nut", i); |
19861 | 137 |
138 sh_video->bih = bih; | |
139 sh_video->ds = demuxer->video; | |
140 sh_video->disp_w = s[i].width; | |
141 sh_video->disp_h = s[i].height; | |
21723 | 142 sh_video->video.dwScale = s[i].time_base.num; |
19861 | 143 sh_video->video.dwRate = s[i].time_base.den; |
144 | |
145 sh_video->fps = sh_video->video.dwRate/ | |
146 (float)sh_video->video.dwScale; | |
147 sh_video->frametime = 1./sh_video->fps; | |
148 sh_video->format = 0; | |
149 for (j = 0; j < s[i].fourcc_len && j < 4; j++) | |
150 sh_video->format |= s[i].fourcc[j]<<(j*8); | |
151 if (!s[i].sample_height) sh_video->aspect = 0; | |
152 else sh_video->aspect = | |
153 s[i].sample_width / (float)s[i].sample_height; | |
154 sh_video->i_bps = 0; // FIXME | |
155 | |
156 bih->biSize = sizeof(BITMAPINFOHEADER) + | |
157 s[i].codec_specific_len; | |
158 bih->biWidth = s[i].width; | |
159 bih->biHeight = s[i].height; | |
160 bih->biBitCount = 0; // FIXME | |
161 bih->biSizeImage = 0; // FIXME | |
162 bih->biCompression = sh_video->format; | |
163 | |
164 if (s[i].codec_specific_len) | |
165 memcpy(bih + 1, s[i].codec_specific, | |
166 s[i].codec_specific_len); | |
167 | |
168 demuxer->video->id = i; | |
169 demuxer->video->sh = demuxer->v_streams[i]; | |
170 break; | |
171 } | |
172 } | |
173 | |
174 return demuxer; | |
175 } | |
176 | |
177 static int demux_nut_fill_buffer(demuxer_t * demuxer, demux_stream_t * dsds) { | |
28099
3d88e7067d06
Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut API
ods15
parents:
27730
diff
changeset
|
178 nut_priv_tt * priv = demuxer->priv; |
3d88e7067d06
Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut API
ods15
parents:
27730
diff
changeset
|
179 nut_context_tt * nut = priv->nut; |
19861 | 180 demux_packet_t *dp; |
181 demux_stream_t *ds; | |
28099
3d88e7067d06
Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut API
ods15
parents:
27730
diff
changeset
|
182 nut_packet_tt pd; |
19861 | 183 int ret; |
184 double pts; | |
185 | |
186 demuxer->filepos = stream_tell(demuxer->stream); | |
187 if (stream_eof(demuxer->stream)) return 0; | |
188 | |
21022 | 189 while ((ret = nut_read_next_packet(nut, &pd)) == NUT_ERR_EAGAIN); |
20938 | 190 if (ret) { |
191 if (ret != NUT_ERR_EOF) | |
192 mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", | |
193 nut_error(ret)); | |
194 return 0; // fatal error | |
19861 | 195 } |
196 | |
21723 | 197 pts = (double)pd.pts * priv->s[pd.stream].time_base.num / |
19861 | 198 priv->s[pd.stream].time_base.den; |
199 | |
200 if (pd.stream == demuxer->audio->id) { | |
201 ds = demuxer->audio; | |
202 } | |
203 else if (pd.stream == demuxer->video->id) { | |
204 ds = demuxer->video; | |
205 } | |
206 else { | |
20926 | 207 uint8_t buf[pd.len]; |
21022 | 208 while ((ret = nut_read_frame(nut, &pd.len, buf)) == NUT_ERR_EAGAIN); |
20938 | 209 if (ret) { |
19958 | 210 mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", |
20938 | 211 nut_error(ret)); |
212 return 0; // fatal error | |
19861 | 213 } |
214 return 1; | |
215 } | |
216 | |
217 if (pd.stream == 0) priv->last_pts = pd.pts; | |
218 | |
219 dp = new_demux_packet(pd.len); | |
220 | |
221 dp->pts = pts; | |
222 | |
223 dp->pos = demuxer->filepos; | |
224 dp->flags= (pd.flags & NUT_FLAG_KEY) ? 0x10 : 0; | |
225 | |
21022 | 226 {int len = pd.len; |
227 while ((ret = nut_read_frame(nut, &len, dp->buffer + pd.len-len)) == NUT_ERR_EAGAIN); | |
228 } | |
20938 | 229 if (ret) { |
19958 | 230 mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", |
20938 | 231 nut_error(ret)); |
232 return 0; // fatal error | |
19861 | 233 } |
19958 | 234 |
19861 | 235 ds_add_packet(ds, dp); // append packet to DS stream |
236 return 1; | |
237 } | |
238 | |
239 static void demux_seek_nut(demuxer_t * demuxer, float time_pos, float audio_delay, int flags) { | |
28099
3d88e7067d06
Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut API
ods15
parents:
27730
diff
changeset
|
240 nut_context_tt * nut = ((nut_priv_tt*)demuxer->priv)->nut; |
3d88e7067d06
Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut API
ods15
parents:
27730
diff
changeset
|
241 nut_priv_tt * priv = demuxer->priv; |
19861 | 242 int nutflags = 0; |
243 int ret; | |
244 const int tmp[] = { 0, -1 }; | |
245 | |
25883
baf32110d3fc
Use defines to give names to the different seek flags.
reimar
parents:
25707
diff
changeset
|
246 if (!(flags & SEEK_ABSOLUTE)) { |
19861 | 247 nutflags |= 1; // relative |
248 if (time_pos > 0) nutflags |= 2; // forwards | |
249 } | |
250 | |
25883
baf32110d3fc
Use defines to give names to the different seek flags.
reimar
parents:
25707
diff
changeset
|
251 if (flags & SEEK_FACTOR) |
19861 | 252 time_pos *= priv->s[0].max_pts * |
21723 | 253 (double)priv->s[0].time_base.num / |
19861 | 254 priv->s[0].time_base.den; |
255 | |
21022 | 256 while ((ret = nut_seek(nut, time_pos, nutflags, tmp)) == NUT_ERR_EAGAIN); |
21023
f5180197d7ad
fix demux_nut to give proper (estimate) of percent position after a seek
ods15
parents:
21022
diff
changeset
|
257 priv->last_pts = -1; |
20971
e243a3de18c2
missed piece in update to libnut API - non negative errors
ods15
parents:
20938
diff
changeset
|
258 if (ret) mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", nut_error(ret)); |
21023
f5180197d7ad
fix demux_nut to give proper (estimate) of percent position after a seek
ods15
parents:
21022
diff
changeset
|
259 demuxer->filepos = stream_tell(demuxer->stream); |
19861 | 260 } |
261 | |
262 static int demux_control_nut(demuxer_t * demuxer, int cmd, void * arg) { | |
28099
3d88e7067d06
Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut API
ods15
parents:
27730
diff
changeset
|
263 nut_priv_tt * priv = demuxer->priv; |
19861 | 264 switch (cmd) { |
265 case DEMUXER_CTRL_GET_TIME_LENGTH: | |
266 *((double *)arg) = priv->s[0].max_pts * | |
21723 | 267 (double)priv->s[0].time_base.num / |
19861 | 268 priv->s[0].time_base.den; |
269 return DEMUXER_CTRL_OK; | |
270 case DEMUXER_CTRL_GET_PERCENT_POS: | |
21023
f5180197d7ad
fix demux_nut to give proper (estimate) of percent position after a seek
ods15
parents:
21022
diff
changeset
|
271 if (priv->s[0].max_pts == 0 || priv->last_pts == -1) |
19861 | 272 return DEMUXER_CTRL_DONTKNOW; |
273 *((int *)arg) = priv->last_pts * 100 / | |
274 (double)priv->s[0].max_pts; | |
275 return DEMUXER_CTRL_OK; | |
276 default: | |
277 return DEMUXER_CTRL_NOTIMPL; | |
278 } | |
279 } | |
280 | |
281 static void demux_close_nut(demuxer_t *demuxer) { | |
28099
3d88e7067d06
Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut API
ods15
parents:
27730
diff
changeset
|
282 nut_priv_tt * priv = demuxer->priv; |
21011
b3fbda23e570
move demux_nut priv calloc to init() instead of check_file()
ods15
parents:
20971
diff
changeset
|
283 if (!priv) return; |
20925 | 284 nut_demuxer_uninit(priv->nut); |
19861 | 285 free(demuxer->priv); |
286 demuxer->priv = NULL; | |
287 } | |
288 | |
289 | |
25707
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
24118
diff
changeset
|
290 const demuxer_desc_t demuxer_desc_nut = { |
19861 | 291 "NUT demuxer", |
292 "nut", | |
293 "libnut", | |
294 "Oded Shimon (ods15)", | |
295 "NUT demuxer, requires libnut", | |
296 DEMUXER_TYPE_NUT, | |
297 1, // safe check demuxer | |
298 nut_check_file, | |
299 demux_nut_fill_buffer, | |
300 demux_open_nut, | |
301 demux_close_nut, | |
302 demux_seek_nut, | |
303 demux_control_nut | |
304 }; |