virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
82,304 Commits 37 Branches 400 Tags 460 MiB
467eece1be
Commit Graph

266 Commits

Author SHA1 Message Date
Andreas Cadhalpun
0747754622 mpeg4audio: validate sample_rate 
A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Also check for errors from avpriv_mpeg4audio_get_config in
ff_mp4_read_dec_config_descr.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 00:51:49 +01:00
Michael Niedermayer
d88a6bedb9 avformat/isom: Fix old API regression with exporting max bitrate 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 19:46:00 +02:00
Carl Eugen Hoyos
ceab04fb5d lavc/raw: Support QT b64a ARGB64 rawvideo. 
Decoder based on a patch by v0lt, v0lt rambler ru
Fixes ticket #5657.
 2016-08-13 01:44:52 +02:00
Clément Bœsch
8ef57a0d61 Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 21:55:34 +02:00
Kongqun Yang
54327c2b34 Add experimental support for vp9 in iso-bmff 
Implemented according to the draft specification
"VP Codec ISO Media File Format Binding":
http://www.webmproject.org/vp9/#draft-vp-codec-iso-media-file-format-binding

'-strict -2' is required to use this feature.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2016-06-17 10:36:09 -04:00
Paul B Mahol
fdf832a986 avcodec: add BitJazz SheerVideo decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-06-07 21:38:49 +02:00
Piotr Bandurski
4c7d3e827c avformat/isom: add MagicYUV FourCCs 2016-06-01 14:59:06 +02:00
Vittorio Giovara
41ed7ab45f cosmetics: Fix spelling mistakes 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-05-04 18:16:21 +02:00
Carl Eugen Hoyos
0499012a55 lavf/isom: Support Perian tag NELL for nellymoser. 
Reported by forum user turas35.
 2016-04-23 11:11:32 +02:00
Paul B Mahol
323b8c95e4 avformat: add AVFormatContext to ff_get_extradata() 
Needed for av_log() inside that function.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-14 18:21:08 +02:00
Derek Buitenhuis
6f69f7a8bf Merge commit '9200514ad8717c63f82101dc394f4378854325bf' 
* 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>
 2016-04-10 20:59:55 +01:00
Anton Khirnov
9200514ad8 lavf: replace AVStream.codec with AVStream.codecpar 
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.
 2016-02-23 17:01:58 +01:00
Carl Eugen Hoyos
a36c737490 lavf/isom: Add more code points for H264. 
Defined by the MP4 registration authority.
Fixes ticket #5217.
 2016-02-04 17:40:06 +01:00
Christophe Gisquet
3a6a432b58 isom: add support for DNxHR codec family 
This is actually similar to DNxHD.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-10-05 12:44:05 +02:00
Hendrik Leppkes
d02d208211 Merge commit 'c45fcf30cfab687004ed1cdc06ebaa21f4262a0b' 
* commit 'c45fcf30cfab687004ed1cdc06ebaa21f4262a0b':
  DXV decoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 16:07:07 +02:00
Vittorio Giovara
c45fcf30cf DXV decoder 
Support all DXDI and DXD3 normal quality videos.
 2015-09-02 22:22:02 +02:00
Vittorio Giovara
059a934806 lavc: Consistently prefix input buffer defines 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-27 15:24:59 +01:00
Michael Niedermayer
dc07e576ce avformat/isom: Use AVRN codec to handle AVDJ 
Fixes cropping

Fixes Ticket4741

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 22:27:29 +02:00
Ganesh Ajjanagadde
4547cf68a0 avformat/isom: utilize bitrate hints 
Fixes Ticket4546

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 20:23:58 +02:00
Michael Niedermayer
55219a78c7 Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7' 
* commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7':
  Hap decoder and encoder

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/allcodecs.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-22 22:47:32 +02:00
Vittorio Giovara
7ca3e5203f Hap decoder and encoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-06-22 15:23:08 +01:00
Michael Niedermayer
40d552dae6 Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
  Replace av_dlog with normal av_log at trace level

Conflicts:
	ffplay.c
	libavdevice/fbdev_dec.c
	libavfilter/avfilter.c
	libavfilter/internal.h
	libavfilter/setpts.c
	libavfilter/src_movie.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fieldorder.c
	libavformat/assdec.c
	libavformat/avidec.c
	libavformat/flvdec.c
	libavformat/http.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/mov.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/mpegtsenc.c
	libavformat/mux.c
	libavformat/mxfdec.c
	libavformat/nsvdec.c
	libavformat/oggdec.c
	libavformat/r3d.c
	libavformat/rtspdec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 03:19:47 +02:00
Vittorio Giovara
1a3eb042c7 Replace av_dlog with normal av_log at trace level 
This applies to every library where performance is not critical.
 2015-04-19 12:41:59 +01:00
Michael Niedermayer
2cfa1fdb08 Merge commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c' 
* commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c':
  isom: Add support for TSCC2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-17 20:05:53 +01:00
Paul B Mahol
cf9861dea5 isom: Add X-Com Radvision FourCC 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-03-17 13:34:22 +00:00
Luca Barbato
96dd04427f isom: Add support for TSCC2 
As produced by Camtasia 4.
 2015-03-17 12:21:23 +01:00
Paul B Mahol
ac494e5a66 avformat/isom: add X-Com Radvision fourcc 
Fixes bug #4303.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-11 11:47:01 +00:00
Carl Eugen Hoyos
67e9f3907d isom: Decode Prores 4444 XQ with the existing Prores decoder 
The frames seem to contain a higher bitrate which our decoder is
able to handle.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-03 15:23:21 +00:00
Carl Eugen Hoyos
fe47cba7e8 Decode Prores 4444 XQ with the existing Prores decoder. 
The frames are said to contain a higher bit-depth but
users report that our decoder shows visually correct output.
Requested by forum user gregba and Christoph Gerstbauer.
 2015-01-26 12:05:14 +01:00
Michael Niedermayer
4009ee3ecc Merge commit '8e03ca2fff40ce065ea5a516200e777c96cd785e' 
* commit '8e03ca2fff40ce065ea5a516200e777c96cd785e':
  isom: add 'mp1v' fourcc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 00:31:05 +01:00
Justin Ruggles
8e03ca2fff isom: add 'mp1v' fourcc 
As referenced in the CoreMedia API docs.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-01-06 17:05:53 +01:00
Benoit Fouet
5e6fd132ff avformat/movenc: add EAC3 muxing support. 
Support only one independent substream right now, and only syncframes
containing 6 blocks.

Fixes part of ticket #3074

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 19:07:08 +02:00
Carl Eugen Hoyos
afaa39b46d Don't overwrite codec_id with 0 in ff_mp4_read_dec_config_descr(). 
Fixes ticket #3660.
 2014-05-21 22:48:11 +02:00
Peter Ross
07761294fc Silicon Graphics RLE 8-bit video decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-19 16:24:26 +02:00
Michael Niedermayer
1946ad4d8c Merge commit '121b5b7e0476d22408d748b914799b7c00acc3a4' 
* commit '121b5b7e0476d22408d748b914799b7c00acc3a4':
  isom: add some BOXX tags
  isom: add 'flic' tag
  isom: add 'm1v ' tag

Conflicts:
	libavformat/isom.c

See: ca8623e1a5
See: 8a3f976498
See: fca62f0500
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-04 02:44:56 +02:00
Piotr Bandurski
121b5b7e04 isom: add some BOXX tags 2014-04-04 00:20:12 +02:00
Reimar Döffinger
b0a54516eb isom: add 'flic' tag 2014-04-04 00:20:12 +02:00
Carl Eugen Hoyos
5a85cf0fc2 isom: add 'm1v ' tag 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-04 00:20:10 +02:00
Jimmy Christensen
38389058c3 OpenEXR decoder 
Additional fixes and enhancements by Vittorio Giovara, Gonzalo Garramuno,
Nicolas George, Paul B Mahol and Michael Niedermayer.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-01 01:13:09 +02:00
Michael Niedermayer
12789d9636 mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd 
This also moves mov_rewrite_dvd_sub_extradata() to mov.c.

Sample-Id: NeroRecodeSample.mp4
 2014-03-31 01:08:23 +02:00
Michael Niedermayer
96138e8c8d isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata() 
Sample-Id: NeroRecodeSample.mp4
 2014-03-31 01:08:12 +02:00
Michael Niedermayer
9bd4a9f4ee isom: Simplify mov_rewrite_dvd_sub_extradata() 
This avoids the 2nd buffer and fixes the palette truncated check
 2014-03-31 01:05:11 +02:00
Michael Niedermayer
e21235f9b9 avformat/mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd 
This also moves mov_rewrite_dvd_sub_extradata() to mov.c

Fixes: NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 18:36:25 +01:00
Michael Niedermayer
b6ad5893ce avformat/isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata() 
Fixes regression with NeroRecodeSample.mp4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 17:09:33 +01:00
Michael Niedermayer
f6f3c85c0e avformat/isom: Simplify mov_rewrite_dvd_sub_extradata() 
This avoids the 2nd buffer and fixes the palette truncated check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-17 17:06:30 +01:00
Michael Niedermayer
6d7b22fb8f isom: fix C99-style declaration 2014-03-16 23:05:48 +01:00
Michael Niedermayer
cd0982e189 avformat/isom: fix mix of declaration and statement 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-16 14:05:14 +01:00
Michael Niedermayer
09680951df Merge commit '8f629a986c46f227abda1811a6ad1f449871ca35' 
* commit '8f629a986c46f227abda1811a6ad1f449871ca35':
  isom: convert mp4 dvdsub extradata to vobsub format

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-16 13:34:38 +01:00
wm4
8f629a986c isom: convert mp4 dvdsub extradata to vobsub format 
mp4 files embedding DVD subtitles do not use the same extradata format
as the rest of Libav expects. The subtitle decoder in libavcodec in
particular does not understand this format.

Convert the extradata to the vobsub .idx format. mp4 stores the palette
as binary 32 bit ints in YUV. The subtitle resolution is stored
separately in the track header, which we access through AVStream.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-03-15 14:32:58 +01:00
Michael Niedermayer
9563e67e07 Merge commit '4f3db5d3418a24f3b90422e98ad75388052c4284' 
* commit '4f3db5d3418a24f3b90422e98ad75388052c4284':
  movenc: allow muxing HEVC in MODE_MP4.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 23:13:37 +01:00