X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Faiffenc.c;h=861558c78b9f8d9be9b7689b1f7e271c47674c25;hb=f73e3938ac70524826664855210446c3739c4a5e;hp=49aff8bd7860a41820e70adff402ec0790ae001a;hpb=77eb5504d3b3e1047900382350e0bc5e0bfb16b5;p=ffmpeg diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index 49aff8bd786..861558c78b9 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -2,25 +2,28 @@ * AIFF/AIFF-C muxer * Copyright (c) 2006 Patrick Guimond * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/intfloat.h" #include "avformat.h" +#include "internal.h" #include "aiff.h" +#include "avio_internal.h" typedef struct { int64_t form; @@ -33,7 +36,7 @@ static int aiff_write_header(AVFormatContext *s) AIFFOutputContext *aiff = s->priv_data; AVIOContext *pb = s->pb; AVCodecContext *enc = s->streams[0]->codec; - AVExtFloat sample_rate; + uint64_t sample_rate; int aifc = 0; /* First verify if format is ok */ @@ -43,10 +46,10 @@ static int aiff_write_header(AVFormatContext *s) aifc = 1; /* FORM AIFF header */ - put_tag(pb, "FORM"); - aiff->form = url_ftell(pb); + ffio_wfourcc(pb, "FORM"); + aiff->form = avio_tell(pb); avio_wb32(pb, 0); /* file length */ - put_tag(pb, aifc ? "AIFC" : "AIFF"); + ffio_wfourcc(pb, aifc ? "AIFC" : "AIFF"); if (aifc) { // compressed audio enc->bits_per_coded_sample = 16; @@ -55,17 +58,17 @@ static int aiff_write_header(AVFormatContext *s) return -1; } /* Version chunk */ - put_tag(pb, "FVER"); + ffio_wfourcc(pb, "FVER"); avio_wb32(pb, 4); avio_wb32(pb, 0xA2805140); } /* Common chunk */ - put_tag(pb, "COMM"); + ffio_wfourcc(pb, "COMM"); avio_wb32(pb, aifc ? 24 : 18); /* size */ avio_wb16(pb, enc->channels); /* Number of channels */ - aiff->frames = url_ftell(pb); + aiff->frames = avio_tell(pb); avio_wb32(pb, 0); /* Number of frames */ if (!enc->bits_per_coded_sample) @@ -79,8 +82,9 @@ static int aiff_write_header(AVFormatContext *s) avio_wb16(pb, enc->bits_per_coded_sample); /* Sample size */ - sample_rate = av_dbl2ext((double)enc->sample_rate); - avio_write(pb, (uint8_t*)&sample_rate, sizeof(sample_rate)); + sample_rate = av_double2int(enc->sample_rate); + avio_wb16(pb, (sample_rate >> 52) + (16383 - 1023)); + avio_wb64(pb, UINT64_C(1) << 63 | sample_rate << 11); if (aifc) { avio_wl32(pb, enc->codec_tag); @@ -88,16 +92,16 @@ static int aiff_write_header(AVFormatContext *s) } /* Sound data chunk */ - put_tag(pb, "SSND"); - aiff->ssnd = url_ftell(pb); /* Sound chunk size */ + ffio_wfourcc(pb, "SSND"); + aiff->ssnd = avio_tell(pb); /* Sound chunk size */ avio_wb32(pb, 0); /* Sound samples data size */ avio_wb32(pb, 0); /* Data offset */ avio_wb32(pb, 0); /* Block-size (block align) */ - av_set_pts_info(s->streams[0], 64, 1, s->streams[0]->codec->sample_rate); + avpriv_set_pts_info(s->streams[0], 64, 1, s->streams[0]->codec->sample_rate); /* Data is starting here */ - put_flush_packet(pb); + avio_flush(pb); return 0; } @@ -117,44 +121,44 @@ static int aiff_write_trailer(AVFormatContext *s) /* Chunks sizes must be even */ int64_t file_size, end_size; - end_size = file_size = url_ftell(pb); + end_size = file_size = avio_tell(pb); if (file_size & 1) { avio_w8(pb, 0); end_size++; } - if (!url_is_streamed(s->pb)) { + if (s->pb->seekable) { /* File length */ - url_fseek(pb, aiff->form, SEEK_SET); + avio_seek(pb, aiff->form, SEEK_SET); avio_wb32(pb, file_size - aiff->form - 4); /* Number of sample frames */ - url_fseek(pb, aiff->frames, SEEK_SET); + avio_seek(pb, aiff->frames, SEEK_SET); avio_wb32(pb, (file_size-aiff->ssnd-12)/enc->block_align); /* Sound Data chunk size */ - url_fseek(pb, aiff->ssnd, SEEK_SET); + avio_seek(pb, aiff->ssnd, SEEK_SET); avio_wb32(pb, file_size - aiff->ssnd - 4); /* return to the end */ - url_fseek(pb, end_size, SEEK_SET); + avio_seek(pb, end_size, SEEK_SET); - put_flush_packet(pb); + avio_flush(pb); } return 0; } AVOutputFormat ff_aiff_muxer = { - "aiff", - NULL_IF_CONFIG_SMALL("Audio IFF"), - "audio/aiff", - "aif,aiff,afc,aifc", - sizeof(AIFFOutputContext), - CODEC_ID_PCM_S16BE, - CODEC_ID_NONE, - aiff_write_header, - aiff_write_packet, - aiff_write_trailer, - .codec_tag= (const AVCodecTag* const []){ff_codec_aiff_tags, 0}, + .name = "aiff", + .long_name = NULL_IF_CONFIG_SMALL("Audio IFF"), + .mime_type = "audio/aiff", + .extensions = "aif,aiff,afc,aifc", + .priv_data_size = sizeof(AIFFOutputContext), + .audio_codec = CODEC_ID_PCM_S16BE, + .video_codec = CODEC_ID_NONE, + .write_header = aiff_write_header, + .write_packet = aiff_write_packet, + .write_trailer = aiff_write_trailer, + .codec_tag = (const AVCodecTag* const []){ ff_codec_aiff_tags, 0 }, };