highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/rpl: Support files containing 8 bit PCM or VIDC audio

Browse Source 
Signed-off-by: Cameron Cawley <ccawley2011@gmail.com>
This commit is contained in:
Cameron Cawley 2018-10-13 00:06:40 +01:00 committed by Paul B Mahol
parent 22238d0b94
commit 0e9c01fd87
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/rpl.c
View File

@ -119,6 +119,8 @@ static int rpl_read_header(AVFormatContext *s)
AVStream *vst = NULL, *ast = NULL; AVStream *vst = NULL, *ast = NULL;
int total_audio_size; int total_audio_size;
int error = 0; int error = 0;
const char *endptr;
char audio_type[RPL_LINE_LENGTH];
uint32_t i; uint32_t i;
@ -188,7 +190,9 @@ static int rpl_read_header(AVFormatContext *s)
ast->codecpar->codec_tag = audio_format; ast->codecpar->codec_tag = audio_format;
ast->codecpar->sample_rate = read_line_and_int(pb, &error); // audio bitrate ast->codecpar->sample_rate = read_line_and_int(pb, &error); // audio bitrate
ast->codecpar->channels = read_line_and_int(pb, &error); // number of audio channels ast->codecpar->channels = read_line_and_int(pb, &error); // number of audio channels
ast->codecpar->bits_per_coded_sample = read_line_and_int(pb, &error); // audio bits per sample error |= read_line(pb, line, sizeof(line));
ast->codecpar->bits_per_coded_sample = read_int(line, &endptr, &error); // audio bits per sample
strcpy(audio_type, endptr);
// At least one sample uses 0 for ADPCM, which is really 4 bits // At least one sample uses 0 for ADPCM, which is really 4 bits
// per sample. // per sample.
if (ast->codecpar->bits_per_coded_sample == 0) if (ast->codecpar->bits_per_coded_sample == 0)
@ -205,6 +209,17 @@ static int rpl_read_header(AVFormatContext *s)
// 16-bit audio is always signed // 16-bit audio is always signed
ast->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; ast->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE;
break; break;
} else if (ast->codecpar->bits_per_coded_sample == 8) {
if(strstr(audio_type, "unsigned") != NULL) {
ast->codecpar->codec_id = AV_CODEC_ID_PCM_U8;
break;
} else if(strstr(audio_type, "linear") != NULL) {
ast->codecpar->codec_id = AV_CODEC_ID_PCM_S8;
break;
} else {
ast->codecpar->codec_id = AV_CODEC_ID_PCM_VIDC;
break;
}
} }
// There are some other formats listed as legal per the spec; // There are some other formats listed as legal per the spec;
// samples needed. // samples needed.