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

gxf: convert to new channel layout API

Browse Source 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Vittorio Giovara
2017-03-31 14:15:26 +02:00
committed by James Almer
parent f36e9b30b0
commit 92e9b6ab6d
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/gxf.c
View File

@@ -143,8 +143,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) {
case 9: case 9:
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_id = AV_CODEC_ID_PCM_S24LE; st->codecpar->codec_id = AV_CODEC_ID_PCM_S24LE;
st->codecpar->channels = 1; st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;
st->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
st->codecpar->sample_rate = 48000; st->codecpar->sample_rate = 48000;
st->codecpar->bit_rate = 3 * 1 * 48000 * 8; st->codecpar->bit_rate = 3 * 1 * 48000 * 8;
st->codecpar->block_align = 3 * 1; st->codecpar->block_align = 3 * 1;
@@ -153,8 +152,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) {
case 10: case 10:
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; st->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE;
st->codecpar->channels = 1; st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;
st->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
st->codecpar->sample_rate = 48000; st->codecpar->sample_rate = 48000;
st->codecpar->bit_rate = 2 * 1 * 48000 * 8; st->codecpar->bit_rate = 2 * 1 * 48000 * 8;
st->codecpar->block_align = 2 * 1; st->codecpar->block_align = 2 * 1;
@@ -163,8 +161,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) {
case 17: case 17:
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_id = AV_CODEC_ID_AC3; st->codecpar->codec_id = AV_CODEC_ID_AC3;
st->codecpar->channels = 2; st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO;
st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO;
st->codecpar->sample_rate = 48000; st->codecpar->sample_rate = 48000;
break; break;
case 26: /* AVCi50 / AVCi100 (AVC Intra) */ case 26: /* AVCi50 / AVCi100 (AVC Intra) */

2
libavformat/gxfenc.c
View File

@@ -714,7 +714,7 @@ static int gxf_write_header(AVFormatContext *s)
av_log(s, AV_LOG_ERROR, "only 48000hz sampling rate is allowed\n"); av_log(s, AV_LOG_ERROR, "only 48000hz sampling rate is allowed\n");
return -1; return -1;
} }
if (st->codecpar->channels != 1) { if (st->codecpar->ch_layout.nb_channels != 1) {
av_log(s, AV_LOG_ERROR, "only mono tracks are allowed\n"); av_log(s, AV_LOG_ERROR, "only mono tracks are allowed\n");
return -1; return -1;
} }