wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
61250 commits 40 branches 405 tags 230 MiB
Commit graph

61250 commits

This branch
This branch
All branches
Author SHA1 Message Date
Timothy Gu
53eb4e0799 Add fieldmatch test 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-10 02:59:01 +01:00
Michael Niedermayer
fb0023639e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 23:41:02 +01:00
Michael Niedermayer
38aee6408a Merge commit 'a823d09486' 
* commit 'a823d09486':
  matroskaenc: write private data in hvcC format for HEVC.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 23:34:17 +01:00
Michael Niedermayer
88c8e4afea avformat/hevc: fix mix of av_malloc() with free() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 23:27:31 +01:00
Michael Niedermayer
9563e67e07 Merge commit '4f3db5d341' 
* commit '4f3db5d341':
  movenc: allow muxing HEVC in MODE_MP4.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 23:13:37 +01:00
Michael Niedermayer
5d5e2bd862 avformat/hevc: Make return codes consistent and more flexible 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 23:12:45 +01:00
Michael Niedermayer
a379813cee Merge commit 'b6c61fb83e' 
* commit 'b6c61fb83e':
  movenc: enable Annex B to MP4 conversion for HEVC tracks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 23:08:33 +01:00
Michael Niedermayer
cb403b2570 avformat: fix hevcs use of golomb from avformat 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:59:46 +01:00
Michael Niedermayer
1b1d77ae9b Merge commit '20b40a597c' 
* commit '20b40a597c':
  movenc: write hvcC tag for HEVC.

Conflicts:
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:48:08 +01:00
Michael Niedermayer
ce1ad8d775 Merge commit '1d9014f0b0' 
* commit '1d9014f0b0':
  movenc: use 'hev1' tag for HEVC in MODE_MOV.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:31:55 +01:00
Michael Niedermayer
7a69ffaf0d Merge commit '3e0175d89a' 
* commit '3e0175d89a':
  riff: add VP9 fourcc

See: eb7f7b797f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:30:58 +01:00
Michael Niedermayer
4aa48e467b Merge commit 'fb0a988f94' 
* commit 'fb0a988f94':
  riff: IPJ2 decodes with JPEG2000 decoder

See: b18c27def8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:29:17 +01:00
Michael Niedermayer
0cf6b3b5b7 Merge commit '9e71cc81f3' 
* commit '9e71cc81f3':
  movdec: handle 0x7fff langcode as macintosh per the specs

See: e636aa1a56
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:27:37 +01:00
Michael Niedermayer
858d9947e4 Merge commit '8a0bc40545' 
* commit '8a0bc40545':
  libspeex: support ZygoAudio (quality 10 mode)

Conflicts:
	libavformat/isom.c

See: e26b066cd8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:25:41 +01:00
Michael Niedermayer
9f71e5d39e Merge commit '360022bd3b' 
* commit '360022bd3b':
  isom: lpcm in mov default to big endian

See: 8b3964ecd1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:23:55 +01:00
Michael Niedermayer
c68e53f272 Merge commit 'db32f14c3d' 
* commit 'db32f14c3d':
  isom: add "MNG" FourCC

See: 8d0ec6e060
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:22:23 +01:00
Michael Niedermayer
76367f453f Merge commit '073cd30fb4' 
* commit '073cd30fb4':
  isom: Support MPEG-2 video mov files from FPC5

See: 0aded6bf02
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:21:12 +01:00
Michael Niedermayer
d32245e5b1 Merge commit '31e558fbcf' 
* commit '31e558fbcf':
  isom: add "NO16" FourCC

Conflicts:
	libavformat/isom.c

See: 96e2507363
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:15:32 +01:00
Michael Niedermayer
2030b3a4ab Merge commit '6509012398' 
* commit '6509012398':
  isom: add Radius DV YUV FourCCs

See: a489db6cde
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:14:02 +01:00
Michael Niedermayer
6783b3eb76 avformat/isom: remove duplicated line 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:12:37 +01:00
Michael Niedermayer
2f41b18696 Merge commit 'eeae858596' 
* commit 'eeae858596':
  isom: Support Sony XAVC in mov

See: 5b9f39860d
See: 6e65e34837
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:11:08 +01:00
Michael Niedermayer
8a5397d88b Merge commit 'c09804684a' 
* commit 'c09804684a':
  isom: add xd51 hdcam

See: 4110828e15
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:06:35 +01:00
Michael Niedermayer
eaaa5801ef Merge commit '4d33873c29' 
* commit '4d33873c29':
  hevc: make pps/sps ids unsigned where necessary

Conflicts:
	libavcodec/hevc.h
	libavcodec/hevc_ps.c

See: d1e6602665
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 21:44:40 +01:00
Michael Niedermayer
06219db935 Merge commit 'ed06e5d92b' 
* commit 'ed06e5d92b':
  hevc: Do not turn 32bit timebases into negative numbers

Conflicts:
	libavcodec/hevc.c

See: bf2ce19e51
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 21:16:33 +01:00
Michael Niedermayer
26568c04a8 Merge commit '6cc94e9719' 
* commit '6cc94e9719':
  hevc: use av_mallocz() for allocating tab_ipm

See: 0999f1613b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 21:13:30 +01:00
Michael Niedermayer
e15a57b67a Merge commit '920c01adce' 
* commit '920c01adce':
  hevc: Use get_bits_long() in decode_vui()

See: b818637b84
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 20:57:02 +01:00
Tim Walker
558b20d729 matroskaenc: enable Annex B to MP4 conversion for HEVC tracks. 2014-03-09 18:09:40 +01:00
Tim Walker
a823d09486 matroskaenc: write private data in hvcC format for HEVC. 2014-03-09 18:09:40 +01:00
Tim Walker
4f3db5d341 movenc: allow muxing HEVC in MODE_MP4. 2014-03-09 18:09:40 +01:00
Tim Walker
b6c61fb83e movenc: enable Annex B to MP4 conversion for HEVC tracks. 2014-03-09 18:09:40 +01:00
Tim Walker
20b40a597c movenc: write hvcC tag for HEVC. 2014-03-09 18:09:40 +01:00
Tim Walker
1d9014f0b0 movenc: use 'hev1' tag for HEVC in MODE_MOV. 
'hvc1' requires that parameter set NAL units be
present only in the samples entry, but not in the
samples themselves, requiring that additional
parameter sets, if present, be filtered out of the
samples and placed in new, additional sample entries
if they override or otherwise conflict with the
parameter sets present in the first sample entry.
We do not have any way of doing this at present, so
the files we produce can only comply with the
restrictions set for the 'hev1' sample entry name in
ISO/IEC 14496-15.
 2014-03-09 18:09:40 +01:00
James Zern
3e0175d89a riff: add VP9 fourcc 2014-03-09 18:09:39 +01:00
Ben Littler
fb0a988f94 riff: IPJ2 decodes with JPEG2000 decoder 
Samples can be made from mencoder and jp2avi.dll codec.
 2014-03-09 18:09:39 +01:00
Baptiste Coudurier
9e71cc81f3 movdec: handle 0x7fff langcode as macintosh per the specs 
The correct point that seperates ISO and MAC language codes is 0x400
according to the current QT spec. Old QT specs did not list where this
seperation is but apparently only defined the meaning of the first 137.
 2014-03-09 18:09:39 +01:00
Piotr Bandurski
8a0bc40545 libspeex: support ZygoAudio (quality 10 mode) 2014-03-09 18:09:39 +01:00
Mark Himsley
360022bd3b isom: lpcm in mov default to big endian 
It is my understanding that "Unless otherwise stated, all data in a
QuickTime movie is stored in big-endian byte ordering" [1] in MOV files.

I have a couple of thousand files, which technically are invalid because
their sound sample description element 4CC is 'lpcm' but its version is
0 - and "Version 0 supports only uncompressed audio in raw ('raw ') or
twos-complement ('twos') format" [2]

Because isom.c only contains a mapping for 4CC 'lpcm' to
AV_CODEC_ID_PCM_S16LE, these files have their audio decoded as LE when
it is actually BE.

This commit adds AV_CODEC_ID_PCM_S16BE as the first match for 4CC 'lpcm'.

[1]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 21
[2]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 178

Reviewed-by: Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
 2014-03-09 18:09:39 +01:00
Piotr Bandurski
db32f14c3d isom: add "MNG" FourCC 2014-03-09 18:09:39 +01:00
Carl Eugen Hoyos
073cd30fb4 isom: Support MPEG-2 video mov files from FPC5 2014-03-09 18:09:39 +01:00
Piotr Bandurski
31e558fbcf isom: add "NO16" FourCC 2014-03-09 18:09:39 +01:00
Piotr Bandurski
6509012398 isom: add Radius DV YUV FourCCs 2014-03-09 18:09:38 +01:00
Carl Eugen Hoyos
eeae858596 isom: Support Sony XAVC in mov 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-03-09 18:09:38 +01:00
Ben Littler
c09804684a isom: add xd51 hdcam 
Someone needs to binary search FCP for new isom...
 2014-03-09 18:09:38 +01:00
Vittorio Giovara
4d33873c29 hevc: make pps/sps ids unsigned where necessary 
Fixes integer overflow and out of array accesses.
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
 2014-03-09 17:23:08 +01:00
Michael Niedermayer
ed06e5d92b hevc: Do not turn 32bit timebases into negative numbers 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
 2014-03-09 17:22:53 +01:00
Michael Niedermayer
6cc94e9719 hevc: use av_mallocz() for allocating tab_ipm 
Fixes use of uninitialized memory and out of stack array read.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
 2014-03-09 17:08:11 +01:00
Michael Niedermayer
8dfd0e62f5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  float_dsp: fix errors in documentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 15:37:35 +01:00
Michael Niedermayer
4159f702a7 avutil/timer: Fix units for x86 after c708b54033 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 15:22:02 +01:00
Michael Niedermayer
c2923100f5 Merge commit 'c708b54033' 
* commit 'c708b54033':
  timer: use mach_absolute_time as high resolution clock on darwin

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 14:30:24 +01:00
Michael Niedermayer
fa4f573997 Merge commit '634d9d8b39' 
* commit '634d9d8b39':
  arm: get_cabac inline asm

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