generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
62,945 Commits 24 Branches 241 Tags 173 MiB
4210cbf193
Commit Graph

62945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
c2cd0945c9 Merge commit '502512ea0f179165782777265f441d4061ff6012' 
* commit '502512ea0f179165782777265f441d4061ff6012':
  avutil: Add av_get_time_base_q()

Conflicts:
	doc/APIchanges
	libavutil/utils.c
	libavutil/version.h

See: dac7e8a94e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 00:38:39 +02:00
Michael Niedermayer
4b6bb7bfe1 Merge commit '9155c595f1a9c5a089a59e2c0aefdfabd0a6c59b' 
* commit '9155c595f1a9c5a089a59e2c0aefdfabd0a6c59b':
  fic: Support rendering cursors

Not merged as the commit is missing changes that where replied to with "done" on ffmpeg-devel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 00:19:12 +02:00
Michael Niedermayer
83412f00e9 Merge commit '40b331e1f41cf118bd1b0807cac801437255636f' 
* commit '40b331e1f41cf118bd1b0807cac801437255636f':
  fic: Use proper quantization matrix index

See: 6d149d2818
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 23:58:21 +02:00
Derek Buitenhuis
e299cb2cd3 fic: Simplify alpha blending 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-22 17:51:43 -04:00
Michael Niedermayer
cc17ff8826 Merge commit '3956a5e0ea46ed7e27ca888fe11c47986ad99261' 
* commit '3956a5e0ea46ed7e27ca888fe11c47986ad99261':
  aarch64: NEON vorbis_inverse_coupling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 23:51:19 +02:00
Michael Niedermayer
59bfddfcda Merge commit '8f9fe6ae3461ce270bce6b7083fda5ec314cdad4' 
* commit '8f9fe6ae3461ce270bce6b7083fda5ec314cdad4':
  aarch64: NEON fixed/floating point MPADSP apply_window

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 23:45:50 +02:00
Michael Niedermayer
b0bdc2a712 avutil: move av_get_time_base_q() after include rational.h 
Fix compilation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-22 17:35:51 -04:00
Michael Niedermayer
96a4d0c1c3 Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924' 
* commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924':
  aarch64: NEON float to s16 audio conversion

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 23:33:07 +02:00
Michael Niedermayer
ef1961e7fc Merge commit 'ee2bc5974fe64fd214f52574400ae01c85f4b855' 
* commit 'ee2bc5974fe64fd214f52574400ae01c85f4b855':
  aarch64: NEON float (i)MDCT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 23:27:02 +02:00
Michael Niedermayer
13f4428915 Merge commit '650c4300d94aa9398ff1dd4f454bf39eaa285f62' 
* commit '650c4300d94aa9398ff1dd4f454bf39eaa285f62':
  aarch64: NEON float FFT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 23:06:24 +02:00
Michael Niedermayer
c7251fec39 avutil: move av_get_time_base_q() after include rational.h 
Fix compilation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 22:44:14 +02:00
Derek Buitenhuis
dac7e8a94e avutil: Add av_get_time_base_q() 
This fixes usage of AV_TIME_BASE_Q in C++ applications, which
cannot use compound literals directly in their code.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-22 16:38:33 -04:00
Derek Buitenhuis
502512ea0f avutil: Add av_get_time_base_q() 
This fixes usage of AV_TIME_BASE_Q in C++ applications, which
cannot use compound literals directly in their code.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-22 16:32:35 -04:00
Derek Buitenhuis
6d149d2818 fic: Use proper quantization matrix index 
The matrices are not zigzagged.

Fixes artefacting.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-22 16:22:08 -04:00
Derek Buitenhuis
9155c595f1 fic: Support rendering cursors 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-22 21:20:23 +01:00
Derek Buitenhuis
40b331e1f4 fic: Use proper quantization matrix index 
The matrices are not zigzagged.

Fixes artefacting.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-22 21:20:23 +01:00
Janne Grunau
3956a5e0ea aarch64: NEON vorbis_inverse_coupling 
From the ARMv7 NEON version. 16 times faster as the C version, overall
more than 12% faster vorbis decoding on Apple's A7.
 2014-04-22 22:01:45 +02:00
Janne Grunau
8f9fe6ae34 aarch64: NEON fixed/floating point MPADSP apply_window 
30%/25% (fixed/float) faster mp3 decoding on Apple's A7. The floating
point decoder is approximately 7% faster.
 2014-04-22 22:01:45 +02:00
Reimar Döffinger
ab14bcb104 Add "const" to avoid compiler warning. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-04-22 20:44:31 +02:00
Reimar Döffinger
3bd7a7149f Add missing ';'. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-04-22 20:44:31 +02:00
Reimar Döffinger
8cbf0827e1 Various small spelling fixes. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-04-22 20:44:31 +02:00
Michael Niedermayer
994a582a02 avcodec/dvbsubdec: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 20:08:30 +02:00
Michael Niedermayer
ea8e089ff7 avcodec/cook: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 20:08:30 +02:00
Michael Niedermayer
b20d6cf603 avcodec/dsddec: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 20:08:30 +02:00
Janne Grunau
f4d5a2cc35 aarch64: NEON float to s16 audio conversion 2014-04-22 19:35:41 +02:00
Janne Grunau
ee2bc5974f aarch64: NEON float (i)MDCT 
Approximately as fast as the ARM NEON version on Apple's A7.
 2014-04-22 19:35:41 +02:00
Janne Grunau
650c4300d9 aarch64: NEON float FFT 
Approximately as fast as the ARM NEON version on Apple's A7.
 2014-04-22 19:35:40 +02:00
Michael Niedermayer
f1c48c3a4d avformat/mpegtsenc: make the pes packet length omission optional 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 16:11:12 +02:00
Graham Booker
60fcc19b90 avformat/mpegtsenc: Changed Video PES packet length to 0. 
The rational for this is another issue that plex has exposed.  When it is
conducting a transcode of video to HLS for streaming, my father noticed
artifacts when played on his GoogleTV (NSZ-GT1).  He sent me a test file
and I reproduced it on my device of the same model.  It is important to
note that the artifacts were not present when streaming to VLC or QuickTime
Player.  I copied the command-line that plex used, and conducted all of the
following tests using FFmpeg git.

Transcode to HLS: artifacts on playback
Transcode to TS: playback is fine
Cat HLS segments into a single TS: playback is fine
Segment single TS file to segments: artifacts on playback
Segment single TS file to segments using Apple's HLS segmenter: playback is
fine

At this point I carefully examined the differences between Apple's HLS
segmenter output and FFmpeg's.  Among the considerable differences, I
noticed that the video PES packets always had a 0 length.  So I continued:

Transcode to HLS using FFmpeg with 0 length PES packets: playback is fine.
Segment single TS to segments with 0 length PES packets: playback is fine.

All failures mentioned are only on the GTV since it is the only player on
which I could reproduce artifacts.  I only tested the GTV, VLC, and
QuickTime Player though, so my test case is limited.  I do not know if
other players exhibit this issue.

Since it was useful last time, I have uploaded the test file as
hls_pes_packet_length.m4v along with its associated txt file which contains
the transcode command-line that was used.

Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 16:05:25 +02:00
Hendrik Leppkes
5809c2a99d vc1dsp: fix build without inline asm 
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 14:01:53 +02:00
Michael Niedermayer
8064c6ac5f Merge commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31' 
* commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31':
  lavf: do not use the parser duration for video

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 13:56:29 +02:00
Michael Niedermayer
3bf189bb00 Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b' 
* commit '1ae8198bca749a0cff205196cc83d35b9962849b':
  avconv: always reset packet pts after decoding an audio frame

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 13:45:34 +02:00
Michael Niedermayer
5e6be52bac Merge commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9' 
* commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9':
  lavc: improve AVCodecContext.delay doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 13:34:43 +02:00
Michael Niedermayer
57123dc67e Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091' 
* commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091':
  txd: do not set the codec timebase.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 13:30:23 +02:00
Anton Khirnov
f9157463db lavf: do not use the parser duration for video 
The parser has no way of knowing video duration, and therefore no video
parsers set it.
 2014-04-22 07:46:03 +02:00
Anton Khirnov
1ae8198bca avconv: always reset packet pts after decoding an audio frame 
Currently, if a decoder sets AVFrame.pts, we'd send the same timestamp
to it twice, which is wrong.
 2014-04-22 07:45:49 +02:00
Anton Khirnov
b19a5e5198 lavc: improve AVCodecContext.delay doxy 2014-04-22 07:44:40 +02:00
Anton Khirnov
a4ed995cab txd: do not set the codec timebase. 
It is not supposed to be changed from outside of lavc.
Set the stream timebase and average framerate instead.
 2014-04-22 07:44:16 +02:00
Michael Niedermayer
57fb570908 avformat/avidec: Speed up keyframe detection code 
Fixes Ticket3531

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 04:33:20 +02:00
Derek Buitenhuis
84d6ba60db MAINTAINERS: Add myself as FIC maintainer 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-21 21:27:32 -04:00
Michael Niedermayer
da621ffbcf avcodec/wma: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 02:41:05 +02:00
Michael Niedermayer
658f5d1f63 avfilter/pthread: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 02:40:20 +02:00
Michael Niedermayer
dcad6ba68a avcodec/libxavs: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 02:39:23 +02:00
Michael Niedermayer
78fb5f6e2a avcodec/cngenc: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 02:38:03 +02:00
Michael Niedermayer
0dadbbbfd1 avcodec/snow: use FF_ALLOC(Z)_ARRAY_OR_GOTO 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 02:12:02 +02:00
Michael Niedermayer
47ec0b0b0f avutil/internal: add FF_ALLOC_ARRAY_OR_GOTO & FF_ALLOCZ_ARRAY_OR_GOTO 
These are similar to the existing FF_ALLOCZ_OR_GOTO & FF_ALLOC_OR_GOTO

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 02:09:55 +02:00
Michael Niedermayer
5e5aced585 Merge commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8' 
* commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8':
  mpegvideo: Use the current_picture pts

See: c354576457
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-21 23:57:07 +02:00
Michael Niedermayer
60fdf7dd9e Merge commit '6f243b17c537646b894857d43dfdac65f85ab377' 
* commit '6f243b17c537646b894857d43dfdac65f85ab377':
  avcodec/fic: Fix return value check

See: 230db1426d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-21 23:54:09 +02:00
Michael Niedermayer
e0cdc68bdc Merge commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9' 
* commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9':
  avcodec/fic: clear slice_data

See: 1db8bc5648
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-21 23:52:46 +02:00
Michael Niedermayer
359a719f5f Merge commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575' 
* commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575':
  avcodec/fic: fix slice checks

See: d46ef40129
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-21 23:42:37 +02:00