Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for ulaw and alaw encoded wav files. #31

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+51 −5
Open

Added support for ulaw and alaw encoded wav files. #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8db42a9
Added support for ulaw and alaw encoded wav files.
attermann Aug 31, 2021
5338856
Merge branch 'BelledonneCommunications:master' into master
attermann Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 50 additions & 4 deletions src/audiofilters/msfileplayer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "waveheader.h"
#include "mediastreamer2/msticker.h"
#include "asyncrw.h"
#include "g711.h"

#ifdef HAVE_PCAP
#include <pcap/pcap.h>
Expand All @@ -39,6 +40,7 @@ struct _PlayerData{
int fd;
MSAsyncReader *reader;
MSPlayerState state;
int type;
int rate;
int nchannels;
int hsize;
Expand Down Expand Up @@ -71,6 +73,7 @@ static void player_init(MSFilter *f){
d->fd=-1;
d->state=MSPlayerClosed;
d->swap=FALSE;
d->type=WAVE_FORMAT_PCM;
d->rate=8000;
d->nchannels=1;
d->samplesize=2;
Expand Down Expand Up @@ -157,6 +160,7 @@ static int read_wav_header(PlayerData *d){

if (ret==-1) goto not_a_wav;

d->type=le_uint16(format_chunk->type);
d->rate=le_uint32(format_chunk->rate);
d->nchannels=le_uint16(format_chunk->channel);
if (d->nchannels==0) goto not_a_wav;
Expand Down Expand Up @@ -222,7 +226,7 @@ static int player_open(MSFilter *f, void *arg){
}
d->current_pos_bytes = 0;
ms_filter_notify_no_arg(f,MS_FILTER_OUTPUT_FMT_CHANGED);
ms_message("MSFilePlayer[%p]: %s opened: rate=%i,channel=%i, length=%i ms",f,file,d->rate,d->nchannels, d->duration);
ms_message("MSFilePlayer[%p]: %s opened: type=%i,rate=%i,channel=%i, length=%i ms",f,file,d->type,d->rate,d->nchannels, d->duration);
return 0;
}

Expand Down Expand Up @@ -363,8 +367,30 @@ static void player_process(MSFilter *f){
mblk_set_cseq(om, pcap_seq);
mblk_set_timestamp_info(om, f->ticker->time);
mblk_set_marker_info(om,markbit);
ms_queue_put(f->outputs[0], om);
ms_message("Outputting RTP packet of size %i, seq=%u markbit=%i", bytes, pcap_seq, (int)markbit);
if (d->type == WAVE_FORMAT_MULAW) {
int dbytes = 2/d->samplesize*bytes;
mblk_t *dm=allocb(dbytes,0);
for(;om->b_rptr<om->b_wptr;om->b_rptr++,dm->b_wptr+=2){
*((int16_t*)(dm->b_wptr))=Snack_Mulaw2Lin(*om->b_rptr);
}
freemsg(om);
ms_queue_put(f->outputs[0],dm);
ms_message("Outputting RTP packet of size %i, seq=%u markbit=%i", dbytes, pcap_seq, (int)markbit);
}
else if (d->type == WAVE_FORMAT_ALAW) {
int dbytes = 2/d->samplesize*bytes;
mblk_t *dm=allocb(dbytes,0);
for(;om->b_rptr<om->b_wptr;om->b_rptr++,dm->b_wptr+=2){
*((int16_t*)(dm->b_wptr))=Snack_Alaw2Lin(*om->b_rptr);
}
freemsg(om);
ms_queue_put(f->outputs[0],dm);
ms_message("Outputting RTP packet of size %i, seq=%u markbit=%i", dbytes, pcap_seq, (int)markbit);
}
else {
ms_queue_put(f->outputs[0],om);
ms_message("Outputting RTP packet of size %i, seq=%u markbit=%i", bytes, pcap_seq, (int)markbit);
}
}
d->pcap_seq = pcap_seq;
d->pcap_hdr = NULL;
Expand Down Expand Up @@ -400,7 +426,27 @@ static void player_process(MSFilter *f){
mblk_set_timestamp_info(om,d->ts);
d->ts+=nsamples;
d->current_pos_bytes += bytes;
ms_queue_put(f->outputs[0],om);
if (d->type == WAVE_FORMAT_MULAW) {
int dbytes = 2/d->samplesize*bytes;
mblk_t *dm=allocb(dbytes,0);
for(;om->b_rptr<om->b_wptr;om->b_rptr++,dm->b_wptr+=2){
*((int16_t*)(dm->b_wptr))=Snack_Mulaw2Lin(*om->b_rptr);
}
freemsg(om);
ms_queue_put(f->outputs[0],dm);
}
else if (d->type == WAVE_FORMAT_ALAW) {
int dbytes = 2/d->samplesize*bytes;
mblk_t *dm=allocb(dbytes,0);
for(;om->b_rptr<om->b_wptr;om->b_rptr++,dm->b_wptr+=2){
*((int16_t*)(dm->b_wptr))=Snack_Alaw2Lin(*om->b_rptr);
}
freemsg(om);
ms_queue_put(f->outputs[0],dm);
}
else {
ms_queue_put(f->outputs[0],om);
}
}else freemsg(om);
if (err<bytes){
ms_async_reader_seek(d->reader, d->hsize);
Expand Down
2 changes: 1 addition & 1 deletion src/voip/msmediaplayer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ bool_t ms_media_player_open(MSMediaPlayer *obj, const char *filepath) {
return FALSE;
}
close(fd);
if(wave_header_get_format_type(&header) != WAVE_FORMAT_PCM) {
if(wave_header_get_format_type(&header) != WAVE_FORMAT_PCM && wave_header_get_format_type(&header) != WAVE_FORMAT_MULAW && wave_header_get_format_type(&header) != WAVE_FORMAT_ALAW) {
ms_error("Cannot open %s. Codec not supported", filepath);
return FALSE;
}
Expand Down