FFmpeg

Commit Graph

Author	SHA1	Message	Date
James Almer	aa79d13f51	avformat/cafenc: derive Opus frame size from the relevant stream parameters Use the stream duration as last resort, as an off-by-one result of the "st->duration / (caf->packets - 1)" calculation can break playback on some devices. Also, don't write the sample_rate value propagated by encoders like libopus. The sample rate of the audio fed to it is irrelevant after being encoded. Fixes ticket #9930. Signed-off-by: James Almer <jamrial@gmail.com>	2 years ago
Andreas Rheinhardt	d78838414b	avformat/utils: Move creation-time functions to mux_utils Only used by muxers. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>	3 years ago
Vittorio Giovara	eaad010f7b	caf: convert to new channel layout API 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>	3 years ago
Andreas Rheinhardt	d94b641b4a	avformat/cafenc: Fix memleak when trailer is never written Do this by using the AVStream's priv_data for the buffer holding the packet size data. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>	3 years ago
Andreas Rheinhardt	19a6b51fe6	avformat/cafenc: Don't segfault upon allocation error If an array for the packet sizes could not be successfully reallocated when writing a packet, the CAF muxer frees said array, but does not reset the number of valid bytes. As a result, when the trailer is written later, avio_write tries to read that many bytes from NULL, which segfaults. Fix this by not freeing the array in case of error; also, postpone writing the packet data after having successfully (re)allocated the array, so that even on allocation error the file can be correctly finalized. Also remove an unnecessary resetting of the number of size entries used at the end. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>	3 years ago
Andreas Rheinhardt	42fe438482	avformat/cafenc: Fix potential integer overflow (As long as avio_write() only accepts an int, it makes no sense to try to support sizes that don't fit into an int.) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>	3 years ago
Roman Beranek	ed240db9e3	cafenc: fill in avg. packet size later if unknown Frame size of Opus stream was previously presumed here to be 960 samples (20ms), however sizes of 120, 240, 480, 1920, and 2880 are also allowed. It can also alter on a per-packet basis and even multiple frames may be present in a single packet according to the specification, for the sake of simplicity however, let us assume that this doesn't occur. Because the mFramesPerPacket field, representing the number of samples per packet in the ffmpeg terminilogy, is the key factor in calculating packet durations and all that follows from that (index, bitrate, ...), it is crucial to get right. Therefore, if the packet size is not available ahead of time (as it is in the case of Opus), calculate an average from the stream duration once we know how many packets there are and update the filed in the header.	3 years ago
Andreas Rheinhardt	bc70684e74	avformat: Constify all muxer/demuxers This is possible now that the next-API is gone. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: James Almer <jamrial@gmail.com>	4 years ago
Andreas Rheinhardt	ef3224c911	avformat/caf: Deduplicate codec tags list Also saves a relocation. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>	4 years ago
Marton Balint	c05d82fa92	avformat: remove unneeded avio_flush() calls from the end of write_trailer functions The IO context is always flushed by libavformat/mux.c after write_trailer is called, so this change should have no effect at all.	5 years ago
Marton Balint	4bf90e095b	avformat: remove avio_flush() calls from the end of write_header functions To make it consistent with other muxers. The user can still control the generic flushing behaviour after write_header (same way as after packets) using the -flush_packets option, the default typically means to flush unless a non-streamed file output is used. Therefore this change should have no adverse effect on streaming, even if it is assumed that the first packet has a clean buffer, so small seekbacks within the output buffer work even when the IO context is not seekable. Signed-off-by: Marton Balint <cus@passwd.hu>	5 years ago
Carl Eugen Hoyos	d180fce6c7	lavf/cafenc: Only allow mono and stereo for Opus. Found-by: James Almer	7 years ago
Carl Eugen Hoyos	a3accd0c37	lavf/cafenc: Allow muxing opus. QuickTime does not require the (unknown) kuki chunk for decoding.	7 years ago
Carl Eugen Hoyos	b4093e60c5	lavf/caf: Support demuxing Opus. Introduced in macOS High Sierra and iOS 11.	7 years ago
Carl Eugen Hoyos	e274113292	lavc/cafenc: Allow QDMC muxing.	9 years ago
Marton Balint	28fbdece79	avformat: use ff_standardize_creation_time for formats writing all format string metadata Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Marton Balint <cus@passwd.hu>	9 years ago
Michael Niedermayer	b480f0e37a	avformat/cafenc: Move special casing of PCM codecs into ff_codec_caf_tags Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Carl Eugen Hoyos	1acb5ca02a	Improve frame size calculation in caf muxer to fix adpcm_ms remuxing. Fixes ticket #3645.	11 years ago
Carl Eugen Hoyos	2d56f0d054	Write the actual mp3 frame size when muxing into caf if available. Fixes ticket #3648.	11 years ago
Carl Eugen Hoyos	4c49d0824a	Fix alaw and mulaw muxing in caf. Fixes ticket #3644.	11 years ago
Carl Eugen Hoyos	18e7e21e2f	Enable muxing ac-3 in caf. The files play fine with QuickTime.	11 years ago
Carl Eugen Hoyos	fb5518cfb7	Force one stream in caf muxer. Based on `eeb975f5`	11 years ago
Carl Eugen Hoyos	7f1b3c2ca6	Fix muxing QDM2 mono into caf.	12 years ago
Paul B Mahol	c46400ddec	cafenc: do not leak caf->pkt_sizes Signed-off-by: Paul B Mahol <onemda@gmail.com>	12 years ago
Paul B Mahol	9ef29af2e8	cafenc: do not include riff.h ff_codec_get_tag() was moved to internal.h Signed-off-by: Paul B Mahol <onemda@gmail.com>	12 years ago
Carl Eugen Hoyos	a5d4e94a97	Support iLBC in caf.	12 years ago
Paul B Mahol	7fe6f6e2b1	caf muxer: write metadata Signed-off-by: Paul B Mahol <onemda@gmail.com>	12 years ago
Paul B Mahol	73f9d2e887	cafenc: make .long_name match demuxer While here reindent .codec_tag . Signed-off-by: Paul B Mahol <onemda@gmail.com>	12 years ago
Michael Niedermayer	bb2f13c19f	rename missed CodecID to AVCodecID Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Paul B Mahol	a6ef7b3a77	cafenc: replace deprecated av_dbl2int()	13 years ago
Paul B Mahol	ba10207bbe	Use more designated initializers. Also remove some pointless NULL/0 assigments. C++ code must be left as it is because named struct initializers are not supported by C++ standard.	13 years ago
Carl Eugen Hoyos	05a267305d	Support more codecs when muxing caf.	13 years ago
Carl Eugen Hoyos	ef25e70de3	Stream-copying PureVoice into caf works fine.	13 years ago
Carl Eugen Hoyos	9b60b076fb	Support muxing MP1, MP2 and MP3 in caf.	13 years ago
Carl Eugen Hoyos	c6e0332f30	Explicitely fail for unsupported codecs when muxing caf.	13 years ago
Carl Eugen Hoyos	b35477a2f2	Use av_get_bits_per_sample() for mBitsPerChannel in caf.	13 years ago
Carl Eugen Hoyos	88084eecdf	Use little endian for caf codec tags.	14 years ago
Carl Eugen Hoyos	45ecc7a294	Support adpcm_ima_wav and adpcm_ms in caf.	14 years ago
Carl Eugen Hoyos	43e96d0466	Support gsm_ms in caf files.	14 years ago
Carl Eugen Hoyos	6d721f714e	Fix ff_mov_write_chan() so it can be used by other muxers.	14 years ago
Carl Eugen Hoyos	2c4ad1a37b	Initial caf muxer.	14 years ago

45 Commits (d7528af4df169dea0af080f33e41f292a6eba99c)