ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add `.wav` support for sound recording. 

WAV is also set to be the default extension for audio recording.
This commit is contained in:
Edênis Freindorfer Azevedo 2020-01-22 13:50:27 -03:00
parent 588e82f03c
commit f69febfd71
No known key found for this signature in database
GPG Key ID: 968FB6EC280C7222
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/ffmpeg.cpp
View File

@ -12,7 +12,8 @@ struct supportedCodecs {
const supportedCodecs audioSupported[] = { const supportedCodecs audioSupported[] = {
{ AV_CODEC_ID_MP3, "MP3 (MPEG audio layer 3)", "mp3" }, { AV_CODEC_ID_MP3, "MP3 (MPEG audio layer 3)", "mp3" },
{ AV_CODEC_ID_AAC, "ADTS AAC (Advanced Audio Coding)", "aac,adts" } { AV_CODEC_ID_AAC, "ADTS AAC (Advanced Audio Coding)", "aac,adts" },
{ AV_CODEC_ID_PCM_S16LE, "WAV / WAVE (Waveform Audio)", "wav" }
}; };
const supportedCodecs videoSupported[] = { const supportedCodecs videoSupported[] = {
@ -120,7 +121,7 @@ recording::MediaRet recording::MediaRecorder::setup_audio_stream()
} }
} }
} }
if (!isSupported) return MRET_ERR_NOCODEC; if (!isSupported && acodec->supported_samplerates) return MRET_ERR_NOCODEC;
aenc->channels = av_get_channel_layout_nb_channels(aenc->channel_layout); aenc->channels = av_get_channel_layout_nb_channels(aenc->channel_layout);
aenc->channel_layout = AV_CH_LAYOUT_STEREO; aenc->channel_layout = AV_CH_LAYOUT_STEREO;
if (acodec->channel_layouts) if (acodec->channel_layouts)
@ -143,7 +144,10 @@ recording::MediaRet recording::MediaRecorder::setup_audio_stream()
return MRET_ERR_BUFSIZE; return MRET_ERR_BUFSIZE;
// number of samples per frame // number of samples per frame
if (aenc->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) if (aenc->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)
nb_samples = 10000; {
//nb_samples = 10000; // can be any value, but we use our aud buffer size
nb_samples = 1470;
}
else else
nb_samples = aenc->frame_size; nb_samples = aenc->frame_size;
// audio frame for input // audio frame for input
@ -552,6 +556,16 @@ recording::MediaRet recording::MediaRecorder::AddFrame(const uint16_t *aud, int
int realLength = length / sizeof *aud; int realLength = length / sizeof *aud;
bool isMissing = false; bool isMissing = false;
int cp = -1; int cp = -1;
if (c->frame_size == 0) // no compression/limit for audio frames
{
int maxCopy = realLength;
memcpy(audioBuffer + posInAudioBuffer, aud, maxCopy * 2);
posInAudioBuffer += maxCopy;
samplesInAudioBuffer += (maxCopy / 2);
aud += maxCopy;
}
if (samplesInAudioBuffer < c->frame_size) if (samplesInAudioBuffer < c->frame_size)
{ {
int missingSamples = (c->frame_size - samplesInAudioBuffer); int missingSamples = (c->frame_size - samplesInAudioBuffer);
@ -568,7 +582,7 @@ recording::MediaRet recording::MediaRecorder::AddFrame(const uint16_t *aud, int
cp = realLength - maxCopy; cp = realLength - maxCopy;
} }
} }
if (samplesInAudioBuffer != c->frame_size) // not enough samples if (samplesInAudioBuffer != c->frame_size && (c->frame_size > 0 || samplesInAudioBuffer != realLength)) // not enough samples
{ {
return MRET_OK; return MRET_OK;
} }

2
src/wx/cmdevents.cpp
View File

@ -1197,7 +1197,7 @@ EVT_HANDLER_MASK(RecordSoundStartRecording, "Start sound recording...", CMDEN_NS
ext.Replace(wxT(","), wxT(";*.")); ext.Replace(wxT(","), wxT(";*."));
ext.insert(0, wxT("*.")); ext.insert(0, wxT("*."));
if (sound_extno < 0 && ext.find(wxT("*.mp3")) != wxString::npos) if (sound_extno < 0 && ext.find(wxT("*.wav")) != wxString::npos)
sound_extno = extno; sound_extno = extno;
sound_exts.append(ext); sound_exts.append(ext);