annotate libmpdemux/demux_rawaudio.c @ 19406:747a5c394a69

Fix wrong handling of transparency in \fad(\fade).
author eugeni
date Wed, 16 Aug 2006 00:54:59 +0000
parents 83c3afeab35d
children 4d81dbdf46b9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
1
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
2 #include "config.h"
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
3
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
4 #include <stdlib.h>
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
5 #include <stdio.h>
8165
388263fa5a11 FreeBSD fix
nexus
parents: 7867
diff changeset
6 #include <unistd.h>
8451
fb88ccbc5ccc compiler warning fixes
arpi
parents: 8165
diff changeset
7 #include <string.h>
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
8
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16877
diff changeset
9 #include "m_option.h"
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
10
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
11 #include "stream.h"
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
12 #include "demuxer.h"
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
13 #include "stheader.h"
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
14
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
15
9750
0d4904611455 Set deuxer_type instead of using our own global var.
albeu
parents: 9707
diff changeset
16 extern int demuxer_type;
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
17 static int channels = 2;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
18 static int samplerate = 44100;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
19 static int samplesize = 2;
12281
e6f6dac5d77b needed for a/v sync with compressed audio (e.g. raw .mp2 or .ac3 file)
rfelker
parents: 10891
diff changeset
20 static int bitrate = 0;
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
21 static int format = 0x1; // Raw PCM
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
22
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 9800
diff changeset
23 m_option_t demux_rawaudio_opts[] = {
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
24 { "channels", &channels, CONF_TYPE_INT,CONF_RANGE,1,8, NULL },
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
25 { "rate", &samplerate, CONF_TYPE_INT,CONF_RANGE,1000,8*48000, NULL },
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
26 { "samplesize", &samplesize, CONF_TYPE_INT,CONF_RANGE,1,8, NULL },
12281
e6f6dac5d77b needed for a/v sync with compressed audio (e.g. raw .mp2 or .ac3 file)
rfelker
parents: 10891
diff changeset
27 { "bitrate", &bitrate, CONF_TYPE_INT,CONF_MIN,0,0, NULL },
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
28 { "format", &format, CONF_TYPE_INT, CONF_MIN, 0 , 0, NULL },
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
29 {NULL, NULL, 0, 0, 0, 0, NULL}
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
30 };
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
31
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
32
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
33 static demuxer_t* demux_rawaudio_open(demuxer_t* demuxer) {
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
34 sh_audio_t* sh_audio;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
35 WAVEFORMATEX* w;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
36
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
37 sh_audio = new_sh_audio(demuxer,0);
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18710
diff changeset
38 sh_audio->wf = w = malloc(sizeof(WAVEFORMATEX));
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
39 w->wFormatTag = sh_audio->format = format;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
40 w->nChannels = sh_audio->channels = channels;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
41 w->nSamplesPerSec = sh_audio->samplerate = samplerate;
12281
e6f6dac5d77b needed for a/v sync with compressed audio (e.g. raw .mp2 or .ac3 file)
rfelker
parents: 10891
diff changeset
42 if (bitrate > 999)
e6f6dac5d77b needed for a/v sync with compressed audio (e.g. raw .mp2 or .ac3 file)
rfelker
parents: 10891
diff changeset
43 w->nAvgBytesPerSec = bitrate/8;
e6f6dac5d77b needed for a/v sync with compressed audio (e.g. raw .mp2 or .ac3 file)
rfelker
parents: 10891
diff changeset
44 else if (bitrate > 0)
e6f6dac5d77b needed for a/v sync with compressed audio (e.g. raw .mp2 or .ac3 file)
rfelker
parents: 10891
diff changeset
45 w->nAvgBytesPerSec = bitrate*125;
e6f6dac5d77b needed for a/v sync with compressed audio (e.g. raw .mp2 or .ac3 file)
rfelker
parents: 10891
diff changeset
46 else
e6f6dac5d77b needed for a/v sync with compressed audio (e.g. raw .mp2 or .ac3 file)
rfelker
parents: 10891
diff changeset
47 w->nAvgBytesPerSec = samplerate*samplesize*channels;
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
48 w->nBlockAlign = channels*samplesize;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
49 sh_audio->samplesize = samplesize;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
50 w->wBitsPerSample = 8*samplesize;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
51 w->cbSize = 0;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
52
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
53 demuxer->movi_start = demuxer->stream->start_pos;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
54 demuxer->movi_end = demuxer->stream->end_pos;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
55
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
56 demuxer->audio->sh = sh_audio;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
57 sh_audio->ds = demuxer->audio;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
58
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
59 return demuxer;
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
60 }
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
61
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
62 static int demux_rawaudio_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
63 sh_audio_t* sh_audio = demuxer->audio->sh;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
64 int l = sh_audio->wf->nAvgBytesPerSec;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
65 off_t spos = stream_tell(demuxer->stream);
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
66 demux_packet_t* dp;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
67
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
68 if(demuxer->stream->eof)
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
69 return 0;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
70
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
71 dp = new_demux_packet(l);
9707
53e738a54064 Fix a 100L bug wich killed mencoder timing and switch to the new
albeu
parents: 8524
diff changeset
72 dp->pts = (spos - demuxer->movi_start) / (float)(sh_audio->wf->nAvgBytesPerSec);
53e738a54064 Fix a 100L bug wich killed mencoder timing and switch to the new
albeu
parents: 8524
diff changeset
73 dp->pos = (spos - demuxer->movi_start);
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
74
10891
65ed62e138fa Fixed 'reading after EOF'. demuxers didn't check, how many they've read!
lumag
parents: 10594
diff changeset
75 l = stream_read(demuxer->stream,dp->buffer,l);
65ed62e138fa Fixed 'reading after EOF'. demuxers didn't check, how many they've read!
lumag
parents: 10594
diff changeset
76 resize_demux_packet(dp, l);
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
77 ds_add_packet(ds,dp);
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
78
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
79 return 1;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
80 }
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
81
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17012
diff changeset
82 static void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
83 stream_t* s = demuxer->stream;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
84 sh_audio_t* sh_audio = demuxer->audio->sh;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
85 off_t base,pos;
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
86
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
87 base = (flags & 1) ? demuxer->movi_start : stream_tell(s);
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
88 if(flags & 2)
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
89 pos = base + ((demuxer->movi_end - demuxer->movi_start)*rel_seek_secs);
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
90 else
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
91 pos = base + (rel_seek_secs*sh_audio->i_bps);
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
92
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
93 pos -= (pos % (sh_audio->channels * sh_audio->samplesize) );
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
94 stream_seek(s,pos);
8524
fe542f0201ea CDDA seeking fixed
arpi
parents: 8451
diff changeset
95 // printf("demux_rawaudio: streamtell=%d\n",(int)stream_tell(demuxer->stream));
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
diff changeset
96 }
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
97
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
98
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
99 demuxer_desc_t demuxer_desc_rawaudio = {
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
100 "Raw audio demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
101 "rawaudio",
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
102 "rawaudio",
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
103 "?",
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
104 "",
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
105 DEMUXER_TYPE_RAWAUDIO,
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
106 0, // no autodetect
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
107 NULL,
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
108 demux_rawaudio_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
109 demux_rawaudio_open,
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
110 NULL,
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
111 demux_rawaudio_seek,
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
112 NULL
6b86089c2edd Demuxer modularization
rtognimp
parents: 12281
diff changeset
113 };