summaryrefslogtreecommitdiff
path: root/libavformat/riffenc.c
Commit message (Collapse)AuthorAge
* avformat/riff.h : remove unused function parameter "const AVCodecTag *tags" ↵Aleksandr Slobodeniuk2017-08-02
| | | | | | | of "void ff_put_bmp_header()" Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/riffenc: Always write unexpected channel_mask.Carl Eugen Hoyos2016-10-12
| | | | Allows to write arbitrary channel masks also for 16bit 48kHz pcm.
* avformat/riffenc: added possibility to set first to ninth audio language for ↵Florian Diemer2016-10-05
| | | | | | RIFF taged files (e.g. avi files) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '9200514ad8717c63f82101dc394f4378854325bf'Derek Buitenhuis2016-04-10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9200514ad8717c63f82101dc394f4378854325bf': lavf: replace AVStream.codec with AVStream.codecpar This has been a HUGE effort from: - Derek Buitenhuis <derek.buitenhuis@gmail.com> - Hendrik Leppkes <h.leppkes@gmail.com> - wm4 <nfxjfg@googlemail.com> - Clément Bœsch <clement@stupeflix.com> - James Almer <jamrial@gmail.com> - Michael Niedermayer <michael@niedermayer.cc> - Rostislav Pehlivanov <atomnuker@gmail.com> Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavf: replace AVStream.codec with AVStream.codecparAnton Khirnov2016-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
* | lavf/riffenc: Improve spec compliance; Fix WMP playback of AVI with xxpc chunksMats Peterson2016-03-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/riffenc: Handle palette for non-raw codecsMats Peterson2016-03-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/riffenc: Handle AV_PIX_FMT_MONOBLACKMats Peterson2016-02-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/riffenc: Also check codec tag before setting raw_pal_aviMichael Niedermayer2016-02-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/avienc: Add palette after BITMAPINFOHEADERMats Peterson2016-02-21
| | | | | | | | | | | | | | lavf/riffenc: Write space for palette tests/ref/vsynth: Update 1 bpp files for pal8 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Revert "Merge commit '9f1eccb97bf8894cb18b14f642500686505ef186'"Michael Niedermayer2016-01-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This unbreaks muxing-encoding Example: ffmpeg -i matrixbench_mpeg2.mpg new.avi -rw-r----- 1 michael michael 226035354 Jan 1 16:27 new.avi -rw-r----- 1 michael michael 10016802 Jan 1 16:28 ref.avi Also av_get_audio_frame_duration() itself uses frame_size This reverts commit 29e6606e9b42aa811be995e2fcdea4806911bc9f, reversing changes made to 53448461a7720afab0d1f1234af79573fd2e020d.
* | Merge commit '9f1eccb97bf8894cb18b14f642500686505ef186'Hendrik Leppkes2016-01-01
|\| | | | | | | | | | | | | * commit '9f1eccb97bf8894cb18b14f642500686505ef186': ff_parse_specific_params: do not use AVCodecContext.frame_size Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * ff_parse_specific_params: do not use AVCodecContext.frame_sizeAnton Khirnov2015-12-12
| | | | | | | | | | | | It will not be set unless the muxing codec context is also the encoding context, which is discouraged. When the frame size is not known from av_get_audio_frame_duration(), the fallback should still be good enough.
* | avformat/avienc: add muxer option "write_channel_mask"Tobias Rapp2015-09-12
| | | | | | | | | | | | | | Allow writing an empty channel mask into the wave format header. Useful if the input file contains an unknown channel layout. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/riffenc: Set correct block align for mp2.Juanjo2015-06-04
| | | | | | | | | | | | Rounding by Michael. Fixes ticket #4565.
* | avformat/riffenc: Use size_t for strlen in ff_riff_write_info_tag()Michael Niedermayer2015-05-12
| | | | | | | | | | | | Also dont generated corrupted output for larger than 4gb strings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Add prefix to get_codec_guid()Michael Niedermayer2015-02-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/riffenc: move MP3 LSF threshold to the midway point between the 2Michael Niedermayer2014-11-06
| | | | | | | | | | | | No testcase available but this seems more correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe'Michael Niedermayer2014-11-06
|\| | | | | | | | | | | | | * commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe': riffenc: do not fall back on AVCodecContext.frame_size for MP3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riffenc: do not fall back on AVCodecContext.frame_size for MP3Anton Khirnov2014-11-06
| | | | | | | | | | | | | | It will not be set unless the codec context is used as the encoding context, which is discouraged. For MP2, av_get_audio_frame_duration() will already set the frame size properly. For MP3, set the frame size explicitly.
* | avformat/riffenc: Filter out "BottomUp" in ff_put_bmp_header()Benoit Fouet2014-09-23
| | | | | | | | | | | | | | Fixes Ticket1304 Commit message and extradata size bugfix by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '194be1f43ea391eb986732707435176e579265aa'Michael Niedermayer2014-06-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '194be1f43ea391eb986732707435176e579265aa': lavf: switch to AVStream.time_base as the hint for the muxer timebase Conflicts: doc/APIchanges libavformat/filmstripenc.c libavformat/movenc.c libavformat/mxfenc.c libavformat/oggenc.c libavformat/swf.h libavformat/version.h tests/ref/lavf/mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: switch to AVStream.time_base as the hint for the muxer timebaseAnton Khirnov2014-06-18
| | | | | | | | | | | | | | | | | | | | | | | | Previously, AVStream.codec.time_base was used for that purpose, which was quite confusing for the callers. This change also opens the path for removing AVStream.codec. The change in the lavf-mkv test is due to the native timebase (1/1000) being used instead of the default one (1/90000), so the packets are now sent to the crc muxer in the same order in which they are demuxed (previously some of them got reordered because of inexact timestamp conversion).
* | Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'Michael Niedermayer2014-06-18
|\| | | | | | | | | | | | | | | | | | | * commit 'd754ed41727b1fcbab335b510248a9758a73320c': riffenc: take an AVStream instead of an AVCodecContext Conflicts: libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riffenc: take an AVStream instead of an AVCodecContextAnton Khirnov2014-06-18
| | | | | | | | | | | | It will be useful in the following commits. Also, rename the AVCodecContext pointer name from 'stream' to 'codec'.
* | Merge commit '584f88409062f7a134e7391887899e8e723ab6ff'Michael Niedermayer2014-05-17
|\| | | | | | | | | | | | | * commit '584f88409062f7a134e7391887899e8e723ab6ff': riff: Pass block_align to estimate frame duration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Pass block_align to estimate frame durationnu7742014-05-17
| | | | | | | | | | | | Fix incorrect wSamplesPerBlock(=0) written for ADPCM_IMA_WAV Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * riff: add ISMP/timecode tagClément Bœsch2014-04-04
| |
| * riff: Add ITRK tagJames Almer2014-04-04
| | | | | | | | | | Some players, like foobar2000 or modern versions of WMP, create WAV files using the ITRK tag for track instead of IPRT
* | Initialize riff and wav size fields to -1 instead of 0.Carl Eugen Hoyos2014-05-03
| | | | | | | | | | | | | | WMP doess not play the output files if the fields are set to 0 and not overwritten (using pipe output). Fixes ticket #3346.
* | ff_put_wav_header: add flag to force WAVEFORMATEXDaniel Verkamp2014-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially undoes commit 2c4e08d89327595f7f4be57dda4b3775e1198d5e: riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header A new flag, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX, is added to force the use of WAVEFORMATEX rather than PCMWAVEFORMAT even for PCM codecs. This flag is used in the Matroska muxer (the cause of the original change) and in the ASF muxer, because the specifications for these formats indicate explicitly that WAVEFORMATEX should be used. Muxers for other formats will return to the original behavior of writing PCMWAVEFORMAT when writing a header for raw PCM. In particular, this causes raw PCM in WAV to generate the canonical 44-byte header expected by some tools. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not allow writing invalid wav channel layouts by default.Carl Eugen Hoyos2014-04-09
| | | | | | | | | | Neither WMP nor QT play wav files with too large channel layouts. Fixes ticket #3543.
* | ff_put_wav_header: remove manual byte countingDaniel Verkamp2014-03-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support writing E-AC3 in wav.Carl Eugen Hoyos2014-01-29
| |
* | Move GUID-related objects to riffenc.c and riff.c.Carl Eugen Hoyos2014-01-29
| | | | | | | | This simplifies the following eac3-in-wav patch.
* | avformat/riffenc: indentPeter Ross2013-12-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riffenc: add option to ff_put_bmp_header to ignore extradataPeter Ross2013-12-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472'Michael Niedermayer2013-08-06
|/ | | | | | | | | | | * commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472': riff: Move muxing code to a separate file Conflicts: configure libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* riff: Move muxing code to a separate fileDiego Biurrun2013-08-06
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 15:23:35 +0000