mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-16 04:59:25 +02:00
* fixed madopenal.pas: im using alBufferWriteData_LOKI instead of alBufferData to play stereo sounds! If there are any problems with that functions, it would be nice to get some feedback
* enhanced a52 helper functions git-svn-id: trunk@4686 -
This commit is contained in:
ivost
parent
1870c41c40
commit
48ac2cb379
@ -431,7 +431,6 @@ type
|
||||
// codec info
|
||||
sample_rate : cint;
|
||||
bit_rate : cint;
|
||||
//req_chan : cint;
|
||||
end;
|
||||
|
||||
function a52_decoder_init(mm_accel: cuint32; datasource: pointer; read: read_func; seek: seek_func; close: close_func; tell: tell_func): pa52_decoder;
|
||||
@ -497,82 +496,75 @@ begin
|
||||
begin
|
||||
len := PtrInt(decoder^.inbuf_ptr) - PtrInt(@decoder^.inbuf);
|
||||
|
||||
if (len < HEADER_SIZE) or (len < decoder^.frame_size) then
|
||||
begin
|
||||
(* inbuf too small : enlarge *)
|
||||
len := Sizeof(a52_decoder.inbuf) - len;
|
||||
if decoder^.read(decoder^.inbuf_ptr, 1, len, decoder^.datasource) <> len then
|
||||
Exit(ofs);
|
||||
Inc(decoder^.inbuf_ptr, len);
|
||||
end;
|
||||
|
||||
if decoder^.frame_size = 0 then
|
||||
begin
|
||||
(* no header seen : find one. We need at least 7 bytes to parse it *)
|
||||
//WriteLn('no header seen (', len, ')');
|
||||
|
||||
len := HEADER_SIZE - len;
|
||||
if decoder^.read(decoder^.inbuf_ptr, 1, len, decoder^.datasource) <> len then
|
||||
Exit(ofs);
|
||||
|
||||
Inc(decoder^.inbuf_ptr, len);
|
||||
|
||||
if PtrInt(decoder^.inbuf_ptr) - PtrInt(@decoder^.inbuf) = HEADER_SIZE then
|
||||
len := a52_syncinfo(@decoder^.inbuf, decoder^.flags, sample_rate, bit_rate);
|
||||
if len = 0 then
|
||||
begin
|
||||
len := a52_syncinfo(@decoder^.inbuf, decoder^.flags, sample_rate, bit_rate);
|
||||
if len = 0 then
|
||||
begin
|
||||
(* no sync found : move by one byte (inefficient, but simple!) *)
|
||||
Move(decoder^.inbuf[1], decoder^.inbuf[0], HEADER_SIZE - 1);
|
||||
Dec(decoder^.inbuf_ptr);
|
||||
end else begin
|
||||
decoder^.frame_size := len;
|
||||
|
||||
(* update codec info *)
|
||||
decoder^.sample_rate := sample_rate;
|
||||
decoder^.bit_rate := bit_rate;
|
||||
decoder^.channels := ac3_channels[decoder^.flags and $7];
|
||||
if decoder^.flags and A52_LFE <> 0 then
|
||||
Inc(decoder^.channels);
|
||||
|
||||
{WriteLn(' frame_size : ', decoder^.frame_size);
|
||||
WriteLn(' sample_rate : ', sample_rate);
|
||||
WriteLn(' bit_rate : ', bit_rate);
|
||||
WriteLn(' channels : ', decoder^.channels);}
|
||||
|
||||
// test against user channel settings (wrong here)
|
||||
{if decoder^.req_chan = 0 then
|
||||
decoder^.req_chan := decoder^.channels else
|
||||
if decoder^.channels < decoder^.req_chan then
|
||||
decoder^.req_chan := decoder^.channels;}
|
||||
end;
|
||||
end else
|
||||
WriteLn('BUG!!!!');
|
||||
end else begin
|
||||
if len < decoder^.frame_size then
|
||||
begin
|
||||
len := decoder^.frame_size - len;
|
||||
if decoder^.read(decoder^.inbuf_ptr, 1, len, decoder^.datasource) <> len then
|
||||
Exit(ofs);
|
||||
|
||||
Inc(decoder^.inbuf_ptr, len);
|
||||
(* no sync found : move by one byte (inefficient, but simple!) *)
|
||||
Move(decoder^.inbuf[1], decoder^.inbuf[0], PtrInt(decoder^.inbuf_ptr) - PtrInt(@decoder^.inbuf) - 1);
|
||||
Dec(decoder^.inbuf_ptr, 1);
|
||||
end else begin
|
||||
flags := A52_STEREO;//decoder^.flags;
|
||||
level := High(Smallint)-30;
|
||||
decoder^.frame_size := len;
|
||||
|
||||
if a52_frame(decoder^.state, @decoder^.inbuf, flags, level, 0) <> 0 then
|
||||
begin
|
||||
decoder^.inbuf_ptr := @decoder^.inbuf;
|
||||
decoder^.frame_size := 0;
|
||||
Continue;
|
||||
end;
|
||||
(* update codec info *)
|
||||
decoder^.sample_rate := sample_rate;
|
||||
decoder^.bit_rate := bit_rate;
|
||||
decoder^.channels := ac3_channels[decoder^.flags and $7];
|
||||
if decoder^.flags and A52_LFE <> 0 then
|
||||
Inc(decoder^.channels);
|
||||
|
||||
for i := 0 to 5 do
|
||||
begin
|
||||
if a52_block(decoder^.state) <> 0 then
|
||||
Exit(-1);
|
||||
{WriteLn(' frame_size : ', decoder^.frame_size);
|
||||
WriteLn(' sample_rate : ', sample_rate);
|
||||
WriteLn(' bit_rate : ', bit_rate);
|
||||
WriteLn(' channels : ', decoder^.channels);}
|
||||
end;
|
||||
|
||||
float_to_int(decoder^.samples, pointer(PtrInt(buffer) + ofs + 2{channels}*i*256*2{sample_size}), 2{channels});
|
||||
end;
|
||||
Continue;
|
||||
end;
|
||||
|
||||
(* decode the frame *)
|
||||
flags := A52_STEREO;//decoder^.flags;
|
||||
level := High(Smallint)-30;
|
||||
|
||||
if a52_frame(decoder^.state, @decoder^.inbuf, flags, level, 0) <> 0 then
|
||||
begin
|
||||
decoder^.inbuf_ptr := @decoder^.inbuf;
|
||||
decoder^.frame_size := 0;
|
||||
Continue;
|
||||
end;
|
||||
|
||||
for i := 0 to 5 do
|
||||
begin
|
||||
if a52_block(decoder^.state) <> 0 then
|
||||
begin
|
||||
decoder^.inbuf_ptr := @decoder^.inbuf;
|
||||
decoder^.frame_size := 0;
|
||||
|
||||
ofs := ofs + 2{channels}*(6*256){samples}*2{sample_size};
|
||||
num := num - 2{channels}*(6*256){samples}*2{sample_size};
|
||||
Exit(-1);
|
||||
end;
|
||||
|
||||
float_to_int(decoder^.samples, pointer(PtrInt(buffer) + ofs + 2{channels}*i*256*2{sample_size}), 2{channels});
|
||||
end;
|
||||
|
||||
(* skip decoded frame *)
|
||||
Move(decoder^.inbuf[decoder^.frame_size], decoder^.inbuf[0], PtrInt(decoder^.inbuf_ptr) - PtrInt(@decoder^.inbuf) - decoder^.frame_size);
|
||||
Dec(decoder^.inbuf_ptr, decoder^.frame_size);
|
||||
decoder^.frame_size := 0;
|
||||
|
||||
ofs := ofs + 2{channels}*(6*256){samples}*2{sample_size};
|
||||
num := num - 2{channels}*(6*256){samples}*2{sample_size};
|
||||
end;
|
||||
|
||||
Result := ofs;
|
||||
|
||||
@ -224,7 +224,8 @@ begin
|
||||
if codec_read(al_readbuf, al_bufsize) = 0 then
|
||||
Break;
|
||||
|
||||
alBufferData(al_buffers[i], al_format[codec_chan], al_readbuf, al_bufsize, codec_rate);
|
||||
//alBufferData(al_buffers[i], al_format[codec_chan], al_readbuf, al_bufsize, codec_rate);
|
||||
alBufferWriteData_LOKI(al_buffers[i], al_format[codec_chan], al_readbuf, al_bufsize, codec_rate, al_format[codec_chan]);
|
||||
alSourceQueueBuffers(al_source, 1, @al_buffers[i]);
|
||||
end;
|
||||
|
||||
@ -256,7 +257,8 @@ begin
|
||||
Exit(False);
|
||||
end;
|
||||
|
||||
alBufferData(buffer, al_format[codec_chan], al_readbuf, al_bufsize, codec_rate);
|
||||
//alBufferData(buffer, al_format[codec_chan], al_readbuf, al_bufsize, codec_rate);
|
||||
alBufferWriteData_LOKI(buffer, al_format[codec_chan], al_readbuf, al_bufsize, codec_rate, al_format[codec_chan]);
|
||||
alSourceQueueBuffers(al_source, 1, @buffer);
|
||||
|
||||
Dec(processed);
|
||||
@ -277,8 +279,8 @@ begin
|
||||
Write('Enter: '); ReadLn(codec);
|
||||
Write('File: '); ReadLn(Filename);
|
||||
|
||||
{codec := 1;
|
||||
Filename := 'test.mp3';}
|
||||
{codec := 3;
|
||||
Filename := 'test.ac3';}
|
||||
|
||||
|
||||
// load file
|
||||
@ -321,7 +323,7 @@ begin
|
||||
a52_decoder := a52_decoder_init(0, source, @ogg_read_func, @ogg_seek_func, @ogg_close_func, @ogg_tell_func);
|
||||
codec_bs := 2{channels}*1536*2{sample_size};
|
||||
codec_read := @a52_read;
|
||||
codec_rate := 48000;
|
||||
codec_rate := 44100;//48000;
|
||||
codec_chan := 2;
|
||||
end;
|
||||
end;
|
||||
@ -329,6 +331,7 @@ begin
|
||||
if not Assigned(codec_read) then
|
||||
Exit;
|
||||
|
||||
//al_bufsize := 20000 - (20000 mod codec_bs);
|
||||
al_bufsize := 20000 - (20000 mod codec_bs);
|
||||
WriteLn('Codec Blocksize : ', codec_bs);
|
||||
WriteLn('Codec Rate : ', codec_rate);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user