virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

caf: convert to new channel layout API

Browse Source 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Vittorio Giovara 2017-03-31 13:40:18 +02:00 committed by James Almer
parent 658102a823
commit eaad010f7b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/cafdec.c
View File

@ -76,10 +76,10 @@ static int read_desc_chunk(AVFormatContext *s)
caf->bytes_per_packet = avio_rb32(pb); caf->bytes_per_packet = avio_rb32(pb);
st->codecpar->block_align = caf->bytes_per_packet; st->codecpar->block_align = caf->bytes_per_packet;
caf->frames_per_packet = avio_rb32(pb); caf->frames_per_packet = avio_rb32(pb);
st->codecpar->channels = avio_rb32(pb); st->codecpar->ch_layout.nb_channels = avio_rb32(pb);
st->codecpar->bits_per_coded_sample = avio_rb32(pb); st->codecpar->bits_per_coded_sample = avio_rb32(pb);
if (caf->bytes_per_packet < 0 || caf->frames_per_packet < 0 || st->codecpar->channels < 0) if (caf->bytes_per_packet < 0 || caf->frames_per_packet < 0 || st->codecpar->ch_layout.nb_channels < 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
/* calculate bit rate for constant size packets */ /* calculate bit rate for constant size packets */
@ -172,7 +172,7 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size)
} else if (st->codecpar->codec_id == AV_CODEC_ID_OPUS) { } else if (st->codecpar->codec_id == AV_CODEC_ID_OPUS) {
// The data layout for Opus is currently unknown, so we do not export // The data layout for Opus is currently unknown, so we do not export
// extradata at all. Multichannel streams are not supported. // extradata at all. Multichannel streams are not supported.
if (st->codecpar->channels > 2) { if (st->codecpar->ch_layout.nb_channels > 2) {
avpriv_request_sample(s, "multichannel Opus in CAF"); avpriv_request_sample(s, "multichannel Opus in CAF");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }

12
libavformat/cafenc.c
View File

@ -122,7 +122,7 @@ static int caf_write_header(AVFormatContext *s)
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
if (par->codec_id == AV_CODEC_ID_OPUS && par->channels > 2) { if (par->codec_id == AV_CODEC_ID_OPUS && par->ch_layout.nb_channels > 2) {
av_log(s, AV_LOG_ERROR, "Only mono and stereo are supported for Opus\n"); av_log(s, AV_LOG_ERROR, "Only mono and stereo are supported for Opus\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -138,7 +138,7 @@ static int caf_write_header(AVFormatContext *s)
} }
if (par->codec_id != AV_CODEC_ID_MP3 || frame_size != 576) if (par->codec_id != AV_CODEC_ID_MP3 || frame_size != 576)
frame_size = samples_per_packet(par->codec_id, par->channels, par->block_align); frame_size = samples_per_packet(par->codec_id, par->ch_layout.nb_channels, par->block_align);
ffio_wfourcc(pb, "caff"); //< mFileType ffio_wfourcc(pb, "caff"); //< mFileType
avio_wb16(pb, 1); //< mFileVersion avio_wb16(pb, 1); //< mFileVersion
@ -151,13 +151,13 @@ static int caf_write_header(AVFormatContext *s)
avio_wb32(pb, codec_flags(par->codec_id)); //< mFormatFlags avio_wb32(pb, codec_flags(par->codec_id)); //< mFormatFlags
avio_wb32(pb, par->block_align); //< mBytesPerPacket avio_wb32(pb, par->block_align); //< mBytesPerPacket
avio_wb32(pb, frame_size); //< mFramesPerPacket avio_wb32(pb, frame_size); //< mFramesPerPacket
avio_wb32(pb, par->channels); //< mChannelsPerFrame avio_wb32(pb, par->ch_layout.nb_channels); //< mChannelsPerFrame
avio_wb32(pb, av_get_bits_per_sample(par->codec_id)); //< mBitsPerChannel avio_wb32(pb, av_get_bits_per_sample(par->codec_id)); //< mBitsPerChannel
if (par->channel_layout) { if (par->ch_layout.order == AV_CHANNEL_ORDER_NATIVE) {
ffio_wfourcc(pb, "chan"); ffio_wfourcc(pb, "chan");
avio_wb64(pb, 12); avio_wb64(pb, 12);
ff_mov_write_chan(pb, par->channel_layout); ff_mov_write_chan(pb, par->ch_layout.u.mask);
} }
if (par->codec_id == AV_CODEC_ID_ALAC) { if (par->codec_id == AV_CODEC_ID_ALAC) {
@ -247,7 +247,7 @@ static int caf_write_trailer(AVFormatContext *s)
avio_seek(pb, caf->data, SEEK_SET); avio_seek(pb, caf->data, SEEK_SET);
avio_wb64(pb, file_size - caf->data - 8); avio_wb64(pb, file_size - caf->data - 8);
if (!par->block_align) { if (!par->block_align) {
int packet_size = samples_per_packet(par->codec_id, par->channels, par->block_align); int packet_size = samples_per_packet(par->codec_id, par->ch_layout.nb_channels, par->block_align);
if (!packet_size) { if (!packet_size) {
packet_size = st->duration / (caf->packets - 1); packet_size = st->duration / (caf->packets - 1);
avio_seek(pb, FRAME_SIZE_OFFSET, SEEK_SET); avio_seek(pb, FRAME_SIZE_OFFSET, SEEK_SET);