Skip to content

F
ffmpeg.wasm-core
Commit 036079ce authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files
Options

lavf/mpeg: Support alaw in Hikvision CCTV recordings. 

Fixes a sample from ticket #4182.
parent f8413f74
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
libavformat/mpeg.c
View file @ 036079ce
...@@ -547,6 +547,9 @@ redo: ...@@ -547,6 +547,9 @@ redo:
codec_id = AV_CODEC_ID_ADPCM_ADX; codec_id = AV_CODEC_ID_ADPCM_ADX;
// Auto-detect AC-3 // Auto-detect AC-3
request_probe = 50; request_probe = 50;
} else if (m->imkh_cctv && startcode == 0x1c0) {
codec_id = AV_CODEC_ID_PCM_ALAW;
request_probe = 50;
} else { } else {
codec_id = AV_CODEC_ID_MP2; codec_id = AV_CODEC_ID_MP2;
if (m->imkh_cctv) if (m->imkh_cctv)
...@@ -593,7 +596,8 @@ skip: ...@@ -593,7 +596,8 @@ skip:
st->id = startcode; st->id = startcode;
st->codec->codec_type = type; st->codec->codec_type = type;
st->codec->codec_id = codec_id; st->codec->codec_id = codec_id;
if (st->codec->codec_id == AV_CODEC_ID_PCM_MULAW) { if ( st->codec->codec_id == AV_CODEC_ID_PCM_MULAW
|| st->codec->codec_id == AV_CODEC_ID_PCM_ALAW) {
st->codec->channels = 1; st->codec->channels = 1;
st->codec->channel_layout = AV_CH_LAYOUT_MONO; st->codec->channel_layout = AV_CH_LAYOUT_MONO;
st->codec->sample_rate = 8000; st->codec->sample_rate = 8000;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment