Hello ! I managed to make an ogg streamer based on your libshout bindings .
Below are some changes that i have made to your lib
at uos_libsndfile
//by TrustFm
const
SFC_GET_CURRENT_SF_INFO = $1002;
SFC_SET_VBR_ENCODING_QUALITY = $1300;
SFC_SET_COMPRESSION_LEVEL = $1301;
SFC_SET_BITRATE_MODE = $1305;
SF_BITRATE_MODE_CONSTANT = 800; //Constant bitrate.
SF_BITRATE_MODE_AVERAGE = 801; //Average bitrate.
SF_BITRATE_MODE_VARIABLE = 802; //Variable bitrate.
Also changed
//TrustFm
//var
// sf_command_double: function(sndfile: TSNDFILE_HANDLE; command: ctypes.cint;
// var Data: double; datasize: ctypes.cint): ctypes.cint; cdecl;
var
sf_command_double: function(sndfile: TSNDFILE_HANDLE; command: ctypes.cint;
var Data: ctypes.cdouble; datasize: ctypes.cint): ctypes.cint; cdecl;
****************************
at uos
function Tuos_Player.AddIntoFile (Filenamepath: PChar; SampleRate: CDouble;
Channels: cint32; SampleFormat: cint32; FramesCount: cint32;
FileFormat: cint32): cint32;
// Add an Output into audio wav file with custom parameters
// FileName : filename of saved audio wav file
// SampleRate : default: -1 (44100)
// Channels : default: -1 (2:stereo) (0: no channels, 1:mono, 2:stereo, ...)
// SampleFormat : default: -1 (2:Int16) ( 1:Int32, 2:Int16)
// FramesCount : default: -1 (= 4096)
// FileFormat : default: -1 (wav) (0:wav, 1:pcm, 2:custom, 3:ogg);
// result : Output Index in array -1 = error
// example : OutputIndex1 := AddIntoFile (edit5.Text,-1,-1, 0, -1, -1);
var
x: cint32;
wChunkSize: cint32;
wFileSize: cint32;
IDwav: array[0..3] of char;
Header: Tuos_WaveHeaderChunk;
{$IF DEFINED (sndfile)}
sfInfo: TSF_INFO;
{$endif}
//TrustFm
vbr_encoding_quality: ctypes.cdouble;
compression_level: ctypes.cdouble;
bitrate_mode: ctypes.cint;
res_sf_command: ctypes.cint;
begin
result := -1;
x := 0;
SetLength (StreamOut, Length (StreamOut) + 1);
StreamOut[Length (StreamOut) - 1] := Tuos_OutStream.Create ();
x := Length (StreamOut) - 1;
StreamOut[x].Data.Enabled := false;
StreamOut[x].FileBuffer.ERROR := 0;
StreamOut[x].Data.Filename := filenamepath;
if (FileFormat = -1) or (FileFormat = 0) then
StreamOut[x].FileBuffer.FileFormat := 0
else StreamOut[x].FileBuffer.FileFormat := FileFormat;
FillChar (StreamOut[x].FileBuffer, sizeof (StreamOut[x].FileBuffer), 0);
result := x;
if (Channels = -1) then
StreamOut[x].FileBuffer.wChannels := 2
else
StreamOut[x].FileBuffer.wChannels := Channels;
StreamOut[x].Data.Channels := StreamOut[x].FileBuffer.wChannels;
if FramesCount = -1 then StreamOut[x].Data.Wantframes := 65536 Div StreamOut[x].Data.Channels
else
StreamOut[x].Data.Wantframes := FramesCount;
SetLength (StreamOut[x].Data.Buffer, StreamOut[x].Data.Wantframes*StreamOut[x].Data.Channels);
if (SampleFormat = -1) or (SampleFormat = 2) then
begin
StreamOut[x].FileBuffer.wBitsPerSample := 16;
StreamOut[x].Data.SampleFormat := 2;
end;
if (SampleFormat = 1) then
begin
StreamOut[x].FileBuffer.wBitsPerSample := 32;
StreamOut[x].Data.SampleFormat := 1;
end;
if (SampleFormat = 0) then
begin
StreamOut[x].FileBuffer.wBitsPerSample := 32;
StreamOut[x].Data.SampleFormat := 0;
end;
if SampleRate = -1 then
StreamOut[x].FileBuffer.wSamplesPerSec := 44100 //8000 11025 16000 22050 was 44100
else
StreamOut[x].FileBuffer.wSamplesPerSec := roundmath (samplerate);
StreamOut[x].Data.Samplerate := StreamOut[x].FileBuffer.wSamplesPerSec;
StreamOut[x].LoopProc := Nil;
if fileformat = 3 then
begin
// ogg file
{$IF DEFINED (sndfile)}
StreamOut[x].FileBuffer.FileFormat := 3;
StreamOut[x].Data.TypePut := 6;
sfInfo.format := SF_FORMAT_OGG Or SF_FORMAT_VORBIS; //SF_FORMAT_OGG Or SF_FORMAT_VORBIS;
sfInfo.channels := StreamOut[x].Data.Channels;
sfInfo.frames := streamOut[x].Data.Wantframes;
sfinfo.samplerate := StreamOut[x].FileBuffer.wSamplesPerSec;
sfinfo.seekable := 0; //seekable was 0
StreamOut[x].Data.Enabled := true;
StreamOut[x].Data.HandleSt := sf_open (pchar(FileNamepath), SFM_WRITE, sfInfo);
//TrustFm
//
https://github.com/libsndfile/libsndfile/issues/788 //Set the Variable Bit Rate encoding quality.
//The encoding quality value should be between 0.0 (lowest quality) and 1.0 (highest quality).
//Currently this command is only implemented for FLAC and Ogg/Vorbis files.
//It has no effect on un-compressed file formats.
vbr_encoding_quality:=0.1;
res_sf_command:=-1;
res_sf_command := sf_command_pointer(StreamOut[x].Data.HandleSt, SFC_SET_VBR_ENCODING_QUALITY, @vbr_encoding_quality, sizeof(vbr_encoding_quality) );
if res_sf_command = SF_TRUE then begin
compression_level:=1.0;
end else if res_sf_command = SF_FALSE then begin
compression_level:=1.0;
end;
//Set the compression level.
//The compression level should be between 0.0 (minimum compression level) and 1.0 (highest compression level).
//Currently this command is only implemented for FLAC and Ogg/Vorbis files.
//It has no effect on uncompressed file formats.
compression_level:=1.0;//was1.0
res_sf_command:=-1;
res_sf_command := sf_command_pointer(StreamOut[x].Data.HandleSt, SFC_SET_COMPRESSION_LEVEL, @compression_level, sizeof(compression_level) );
if res_sf_command = SF_TRUE then begin //SF_TRUE
compression_level:=1.0;
end else if res_sf_command = SF_FALSE then begin //SF_FALSE
compression_level:=1.0;
end;
{
//Set bitrate mode. SFC_GET_BITRATE_MODE was added for MP3 support
//The bitrate mode is one of:
//SF_BITRATE_MODE_CONSTANT 800 Constant bitrate.
//SF_BITRATE_MODE_AVERAGE 801 Average bitrate.
//SF_BITRATE_MODE_VARIABLE 802 Variable bitrate.
bitrate_mode:=SF_BITRATE_MODE_CONSTANT;
res_sf_command:=-1;
res_sf_command := sf_command_pointer(StreamOut[x].Data.HandleSt, SFC_SET_BITRATE_MODE, @bitrate_mode, SizeOf(bitrate_mode) );
if res_sf_command = SF_TRUE then begin //SF_TRUE
compression_level:=1.0;
end else if res_sf_command = SF_FALSE then begin //SF_FALSE
compression_level:=1.0;
end;
}
{$endif}
end
else
begin
// wav file
StreamOut[x].FileBuffer.Data := TFileStream.Create (filenamepath,fmCreate);
StreamOut[x].FileBuffer.Data.Seek (0, soFromBeginning);
StreamOut[x].Data.TypePut := 0;
IDwav := 'RIFF';
StreamOut[x].FileBuffer.Data.WriteBuffer (IDwav, 4);
wFileSize := 0;
StreamOut[x].FileBuffer.Data.WriteBuffer (wFileSize, 4);
IDwav := 'WAVE';
StreamOut[x].FileBuffer.Data.WriteBuffer (IDwav, 4);
IDwav := 'fmt ';
StreamOut[x].FileBuffer.Data.WriteBuffer (IDwav, 4);
wChunkSize := SizeOf (Header);
StreamOut[x].FileBuffer.Data.WriteBuffer (wChunkSize, 4);
case SampleFormat of
0: Header.wFormatTag := 3;
else Header.wFormatTag := 1;
end;
//Header.wFormatTag := 1;
Header.wChannels := StreamOut[x].FileBuffer.wChannels;
Header.wSamplesPerSec := StreamOut[x].FileBuffer.wSamplesPerSec;
Header.wBitsPerSample := StreamOut[x].FileBuffer.wBitsPerSample;
Header.wBlockAlign := StreamOut[x].FileBuffer.wChannels * Header.wBitsPerSample Div 8;
Header.wAvgBytesPerSec := StreamOut[x].FileBuffer.wSamplesPerSec * Header.wBlockAlign;
Header.wcbSize := 0;
StreamOut[x].FileBuffer.Data.WriteBuffer (Header, SizeOf (Header));
IDwav := 'data';
StreamOut[x].FileBuffer.Data.WriteBuffer (IDwav, 4);
wChunkSize := 0;
StreamOut[x].FileBuffer.Data.WriteBuffer (wChunkSize, 4);
StreamOut[x].Data.Enabled := True;
end;
end;
*************************
finally at uos_shout
shout_set_metadata: function(shhandle :Pshout_t; metadata:Pshout_metadata_t):cint;cdecl; //TrustFm var metadata:shout_metadata_t
shout_metadata_new: function():Pshout_metadata_t;cdecl;
shout_metadata_free: procedure(shhandle:Pshout_metadata_t);cdecl; //TrustFm var shhandle:shout_metadata_t
shout_metadata_add: function(shhandle:Pshout_metadata_t; name:pchar; value:pchar):cint;cdecl; //TrustFm var shhandle:shout_metadata_t
I will come with a demo based on these modded files
The demo streams OGG and can be set the quality and the compression level
Locked
)