4ffbe3f3a5
matroskaenc: check cue point validity before reallocation
...
Prevents memory leak and possible access to freed memory.
Fixes CID605744.
2012-10-09 15:39:05 +02:00
117d8c6d1f
matroska: implement support for ProRes
...
Support Matroska native formatting.
On demuxing prepend a Frame container atom (32bit big endian encoded
frame size and 'icpf' string).
On muxing remove it.
2012-09-19 20:34:14 +02:00
8071dca3d5
matroska: implement support for ALAC
...
Support Matroska native formatting.
On demuxing reconstruct the 36-bytes QuickTime atom that the ALAC
decoder expects by prepending the "atom size", "tag" and
"tag version" fields missing from the Matroska's CodecPrivate
element.
On muxing remove the initial 12 bytes
Sample files are available:
http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska.mka
and the CoreAudio file it was created from with today's mkvmerge:
http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska-source.caf
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-09-19 20:34:14 +02:00
3b4bb19e63
lavf: flush the output AVIOContext in av_write_trailer().
...
This is consistent with stdio and is what we want to do in all cases.
Fixes a bug in the voc muxer which didn't flush in write_trailer()
previously. This is the cause of the change in the test results.
2012-09-15 18:25:07 +02:00
36ef5369ee
Replace all CODEC_ID_* with AV_CODEC_ID_*
2012-08-07 16:00:24 +02:00
6774247a9d
avformat: Drop pointless "format" from container long names
2012-07-30 13:59:06 +02:00
fd48721849
lavf: use conditional notation for default codec in muxer declarations.
...
This removes the use of macro nesting in these code constructs, which
makes it easier to parse in pre-processors.
2012-07-22 16:10:21 -07:00
e9cef89702
avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps.
...
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2012-05-20 19:50:32 -04:00
20234a4bd7
cosmetics: Align muxer/demuxer declarations
...
Also add missing trailing commas, break long codec_tag lines and
add spaces in codec_tag declarations.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-04-06 19:19:59 +03:00
167f3b8de7
libavformat: Add an ff_ prefix to some lavf internal symbols
...
Prefix the functions/tables brktimegm, pcm_read_seek,
dv_offset_reset, voc_get_packet, codec_movaudio_tags,
codec_movvideo_tags.
After this, lavf has no global symbols without the proper prefix.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-02-15 22:06:17 +02:00
3383a53e7d
lavu: replace int/float punning functions
...
The existing functions defined in intfloat_readwrite.[ch] are
both slow and incorrect (infinities are not handled).
This introduces a new header with fast, inline conversion
functions using direct union punning assuming an IEEE-754
system, an assumption already made throughout the code.
The one use of Intel/Motorola extended 80-bit format is
replaced by simpler code sufficient under the present
constraints (positive normal values).
The old functions are marked deprecated and retained for
compatibility.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-11 18:47:19 +00:00
fd095539d1
latmdec: fix audio specific config parsing
...
Pass the correct size in bits to mpeg4audio_get_config and add a flag
to disable parsing of the sync extension when the size is not known.
Latm with AudioMuxVersion 0 does not specify the size of the audio
specific config. Data after the audio specific config can be
misinterpreted as sync extension resulting in random and wrong configs.
2011-12-03 00:42:48 +01:00
c3f9ebf743
lavf: make av_set_pts_info private.
...
It's supposed to be called only from (de)muxers.
2011-11-30 20:34:45 +01:00
44729bc020
matroskaenc: Make sure the seekhead struct is freed even on seek failure
...
The caller expects the seekhead struct to be freed when calling
matroska_write_seekhead. Currently, the structure is leaked if the
seek fails.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-07 22:23:17 +02:00
bb3244dee2
Replace all usage of strcasecmp/strncasecmp
...
All current usages of it are incompatible with localization.
For example strcasecmp("i", "I") != 0 is possible, but would
break many of the places where it is used.
Instead use our own implementations that always treat the data
as ASCII.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-06 11:52:57 +02:00
357db4c263
lavc: use avpriv_ prefix for ff_split_xiph_headers.
...
It's used in lavf.
2011-10-20 21:06:58 +02:00
59a9a23581
lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
...
Specifically, ff_mpeg4audio_sample_rates, ff_mpeg4audio_get_config and
ff_copy_pce_data
2011-10-20 21:06:57 +02:00
c7a63a521b
matroskaenc: write attachments.
2011-09-27 15:26:36 +02:00
3436c4a368
matroskaenc: saner default codecs.
...
libvorbis/libx264 for video if available, otherwise ac3/mpeg4.
2011-08-22 07:16:55 +02:00
a3f2f766af
matroskaenc: vertical alignment.
2011-08-16 20:24:20 +02:00
15c14ce6b2
matroskaenc: implement query_codec()
2011-08-16 20:24:20 +02:00
dfc2c4d900
lavf: use designated initialisers for all (de)muxers.
...
It's more readable and less prone to breakage.
2011-07-17 06:58:37 +02:00
93ade976c8
matroskaenc: make SSA default subtitle codec.
...
It's a better format and we have an encoder for it, so it doesn't fail
like CODEC_ID_TEXT.
2011-07-12 15:25:53 +02:00
1c6d2b7df0
lavf: update AVStream.nb_frames when muxing.
2011-07-08 22:13:52 +02:00
0ebcdf5cda
Do not include mathematics.h in avutil.h
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-03 21:42:06 +01:00
ee8aecd23a
Do not include intfloat_readwrite.h in avutil.h
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-03 21:42:06 +01:00
e6c52cee54
Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().
...
av_get_bits_per_sample_fmt() is deprecated.
2011-06-20 18:56:06 -04:00
d2d67e424f
Remove all uses of now deprecated metadata functions.
2011-06-08 07:43:45 +02:00
945dda41a2
webm: support stereo videos in matroska/webm muxer
...
Create a stereo_mode metadata tag to specify the stereo 3d video layout
using the StereoMode tag in a matroska/webm video track.
2011-05-28 12:15:55 +02:00
89d4c13057
matroskaenc: make sure we don't produce invalid file with no codec ID
...
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-12 18:02:28 +02:00
2501d2f386
matroskaenc: add missing new line in av_log() call
...
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-12 13:08:30 +02:00
eddd580b74
matroskaenc: fix memory leak
...
This fixes a memory leak occurring when no cue points are defined
since commit 91819763
2011-05-04 18:06:45 +01:00
9181976348
matroskaenc: don't write an empty Cues element.
2011-04-07 18:11:24 +02:00
6dc7d80de7
avio: avio_ prefix for url_close_dyn_buf
2011-04-03 22:47:05 +02:00
b92c545282
avio: avio_ prefix for url_open_dyn_buf
2011-04-03 22:46:56 +02:00
8978fedaee
avio: introduce an AVIOContext.seekable field
...
Use it instead of url_is_streamed and AVIOContext.is_streamed.
2011-04-03 22:46:40 +02:00
264935c962
matroskaenc: remove a variable that's unused after bc17bd9.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-23 09:01:49 -04:00
bc17bd90f5
matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config
...
This also fixes broken SBR detection, which produced files with double
sample rate since 8ae0fa2
2011-03-22 21:39:14 -04:00
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
b7f2fdde74
avio: rename put_flush_packet -> avio_flush
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 22:59:39 -04:00
a2704c9712
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-04 11:26:57 -05:00
6b4aa5dac8
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-01 12:12:33 -05:00
77eb5504d3
avio: avio: avio_ prefixes for put_* functions
...
In the name of consistency:
put_byte -> avio_w8
put_<type> -> avio_w<type>
put_buffer -> avio_write
put_nbyte will be made private
put_tag will be merged with avio_put_str
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 14:25:15 -05:00
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 08:37:15 -05:00
737eb5976f
Merge libavcore into libavutil
...
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-15 16:18:21 +01:00
c6610a216e
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
2011-01-26 22:10:09 +00:00
eaa4542b64
matroskaenc: don't duplicate title information
...
Title is already written into special fields designated for it --
per-segment Title, per-chapter ChapString and per-stream Name (yay for
consistent naming). Therefore, don't duplicate it in Tags.
Originally committed as revision 25813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-23 08:24:41 +00:00
ba7d6e798e
Remove usage of deprecated libavcodec/audioconvert.h functions.
...
Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-03 20:19:34 +00:00
03700d399b
Export metadata in the generic format. Deprecate old conversion API.
...
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 19:04:25 +00:00
9b75309c19
matroskaenc: write metadata
...
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Originally committed as revision 25341 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-05 09:40:43 +00:00
2701fd40f9
matroskaenc: add support for muxing SRT tracks
...
Originally committed as revision 24503 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-25 21:16:58 +00:00
d00a351606
matroskaenc: write DisplayUnit element to better match the spec
...
This makes it clear that we are specifying the aspect ratio, and not
the intended display size in pixels.
Originally committed as revision 24239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-14 19:36:14 +00:00
49bd8e4b84
Fix grammar errors in documentation
...
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
5150dd532b
matroska: move LFG state from muxer context to local variable
...
The LFG is only used in one place, so there is no need to keep it in
the context.
Originally committed as revision 23527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 10:44:27 +00:00
e7ddafd515
matroskaenc: Don't write a second seekhead for the clusters; mkvalidate agrees
...
with me that it's unnecessary.
Originally committed as revision 23478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 22:41:11 +00:00
d06735a34a
matroskaenc: Check that tracks was allocated
...
Originally committed as revision 23477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 22:41:06 +00:00
1f4280e744
matroskaenc: Use av_get_random_seed -> lfg for segment UID
...
Originally committed as revision 23476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 22:41:03 +00:00
4a6bef1f36
matroskaenc: Make put_ebml_binary take a void pointer
...
Originally committed as revision 23475 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 22:40:58 +00:00
316d6c153c
Add WebM muxer
...
Patch by James Zern <jzern at google>
Originally committed as revision 23474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 22:40:54 +00:00
ac9baa716b
matroskaenc: Mux clusters better
...
Start them on keyframes when reasonable, and delay writing audio packets
to help ensure that there's audio samples available for the first frame in
clusters.
Patch by James Zern <jzern at google>
Originally committed as revision 23473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 22:40:50 +00:00
7bb83d8ddf
matroskaenc: Write codec time base as default duration for video tracks.
...
This isn't exactly semantically equivalent, but the field has already been
long abused to mean this, and writing it helps in determining a decent cfr
time base when transcoding from a mkv where the video codec stores none (VP8).
Originally committed as revision 23284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 08:58:19 +00:00
577abedb39
matroskaenc: Don't write track timecode scale
...
It's not required for mkv and unsupported in webm
Originally committed as revision 23247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 01:41:38 +00:00
cc947f04cc
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
...
Patch by Jean-Daniel Dupas, devlists shadowlab org
Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 12:29:58 +00:00
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
4896dd57fa
Matroska muxer : Don't create audio tracks for unsupported audio codecs.
...
Originally committed as revision 22669 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 14:34:19 +00:00
d692850bbb
Silence ridiculous gcc warning.
...
Originally committed as revision 22654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 11:11:25 +00:00
66061a1220
Add VorbisComment writing to FLAC files.
...
Patch by James Darnley <james darnley at gmail>.
Originally committed as revision 22605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-20 13:36:43 +00:00
f75ab7a645
cosmetics : Print newline after error message.
...
Originally committed as revision 22551 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 19:03:48 +00:00
f9ff7179ff
mkvenc: Handle negative timestamps correctly
...
Originally committed as revision 22372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 04:23:36 +00:00
654b65d012
mkvenc: Don't try to write packets with unknown timestamps
...
Originally committed as revision 22371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 04:23:33 +00:00
84d4e599a5
mkvenc: write dts for VFW mode
...
Originally committed as revision 22370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 04:23:28 +00:00
871b641b80
Ensure that we write clusters and blocks with known size when streaming
...
Too many demuxers can't cope with clusters of unknown size.
Originally committed as revision 22201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 08:53:14 +00:00
434a70b8f1
Fix indentation
...
Originally committed as revision 22200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 08:53:11 +00:00
30f06a58a0
Simplify starting and ending clusters
...
Originally committed as revision 22199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 08:53:08 +00:00
7a2a484081
Write the first seekhead if writing to a stream, we won't be able to seek
...
back and write it at the end
Originally committed as revision 22198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 08:53:04 +00:00
2529bb3019
Attempt seeking to write EBML master sizes even if streamed
...
Most EBML masters are much smaller than IO_BUFFER_SIZE and thus the size
can be updated. This makes parsing the resulting files easier.
Originally committed as revision 22197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 08:53:00 +00:00
690b412657
matroskaenc: use "title" tag instead of "description" in track title.
...
Patch by Anton Khirnov < whyskas at gmail >
Originally committed as revision 22187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 23:27:34 +00:00
e380b9182b
mkvenc: Write TrackTimecodeScale
...
patch by Rafael (dot) Carre (a) gmail (d) com
Originally committed as revision 21372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 20:49:27 +00:00
2bd0758efa
matroskaenc: Add support for writing chapters.
...
patch by Anton Khirnov wyskas _at_ gmail _dot_ com
Originally committed as revision 20277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 12:17:01 +00:00
1a40491ef2
Add ff_ prefixes to exported symbols in libavformat/riff.h.
...
patch by Daniel Verkamp, aniel drv nu
Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-22 23:09:34 +00:00
2578326f13
Share the function to write a raw FLAC header and use it in the Matroska
...
muxer.
Originally committed as revision 17606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 02:41:53 +00:00
59c6178a54
Use a shared function to validate FLAC extradata.
...
Originally committed as revision 17602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 02:29:24 +00:00
2591821213
Add AVFMT_VARIABLE_FPS to specify which muxers do not need duplicated frames.
...
Originally committed as revision 17554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 15:04:18 +00:00
5e56599878
matroskaenc: use new metadata API
...
Originally committed as revision 17336 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 16:53:05 +00:00
5f8bae8d5c
matroskaenc: correctly handle h264 streams with 3 bytes nal startcodes
...
This implies using ff_avc_parse_nal_units_buf instead of ff_avc_parse_nal_units
because with 3 bytes startcodes the parsed packet size will change, and the
size must be written before the packet content.
Originally committed as revision 16690 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 00:52:12 +00:00
3194b00479
Cosmetics: indent
...
Originally committed as revision 16652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 04:31:42 +00:00
1c3db2aa50
Treat disposition==0 as undefined and don't write the default flag
...
Originally committed as revision 16651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 04:31:14 +00:00
8a86aaa3b2
Flush the buffer after writing the header and when done with writing the files
...
Fixes writing small (~4kb) files.
Originally committed as revision 16650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 04:30:36 +00:00
ca93bc175a
Reindent after last commit
...
Originally committed as revision 16617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-15 14:07:59 +00:00
0a63a676ec
Do not reallocate AVPacket's data when muxing a packet
...
Originally committed as revision 16616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-15 14:03:07 +00:00
6a5d31ac25
Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
...
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 22:19:48 +00:00
abce34d979
matroskaenc: require global header
...
fixes issue696
Originally committed as revision 15667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-22 21:14:42 +00:00
b7f4e76d3d
matroskaenc: correct muxing of ASS packets
...
- split packets to store one ASS event line per Matroska block
- reformat ASS events to Matroska modified format
- extract display duration for ASS events to store as Matroska block duration
Originally committed as revision 15561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 22:57:56 +00:00
291902c274
matroskaenc: use correct EBML ID for block duration
...
Originally committed as revision 15560 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 22:47:10 +00:00
1bfbe8ff9d
matroskaenc: pass the packet size directly as parameter of mkv_blockgroup_size()
...
Originally committed as revision 15559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 22:44:50 +00:00
8401c51407
matroskaenc: remove useless mkv_block_size() function
...
Originally committed as revision 15558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 22:41:58 +00:00
bc5c918ea8
Remove offset_t typedef and use int64_t directly instead.
...
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.
Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-03 10:16:29 +00:00
62c24705c8
matroska: subtitle display duration must be stored in pkt->convergence_duration
...
Originally committed as revision 15206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:08:19 +00:00
c18545929e
Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
...
Originally committed as revision 14947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 16:51:50 +00:00
5972945197
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
...
the corresponding AVStream instead of AVCodecContext
Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 23:43:20 +00:00
Janne Grunau
Luca Barbato
Moritz Bunkus
Anton Khirnov
Diego Biurrun
Ronald S. Bultje
James Zern
Martin Storsjö
Mans Rullgard
Reimar Döffinger
Justin Ruggles
Alok Ahuja
Aurelien Jacobs
Reinhard Tartler
Diego Elio Pettenò
Anton Khirnov
Stefano Sabatini
David Conrad
Jean-Daniel Dupas
Jai Menon
Carl Eugen Hoyos
James Darnley
Rafaël Carré
Daniel Verkamp
Michael Niedermayer
Luca Abeni