OSDN Git Service

android-x86/external-ffmpeg.git
12 years agobuffersink: Implement a poll function.
Michael Niedermayer [Tue, 6 Dec 2011 16:02:15 +0000 (17:02 +0100)]
buffersink: Implement a poll function.
With this the application can find out how many frames are available.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodocs: Minor project name cleanup
Michael Niedermayer [Thu, 8 Dec 2011 19:07:32 +0000 (20:07 +0100)]
docs: Minor project name cleanup

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoindevs.texi: fix application name to match the code
Michael Niedermayer [Thu, 8 Dec 2011 19:02:53 +0000 (20:02 +0100)]
indevs.texi: fix application name to match the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: more exact comment about libavformat.
Michael Niedermayer [Thu, 8 Dec 2011 18:34:53 +0000 (19:34 +0100)]
ffmpeg: more exact comment about libavformat.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoFix typo: Correctly parse 64 byte umid tags in bext metadata.
Carl Eugen Hoyos [Thu, 8 Dec 2011 18:00:55 +0000 (19:00 +0100)]
Fix typo: Correctly parse 64 byte umid tags in bext metadata.

12 years agolavu: introduce av_log_format_line.
Nicolas George [Thu, 8 Dec 2011 12:54:05 +0000 (13:54 +0100)]
lavu: introduce av_log_format_line.

12 years agoMerge remote-tracking branch 'shariman/wmall'
Michael Niedermayer [Thu, 8 Dec 2011 17:44:37 +0000 (18:44 +0100)]
Merge remote-tracking branch 'shariman/wmall'

* shariman/wmall:
  Pass pointer to integer buffer instead of integer to memcpy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agompegtsenc: recognize .mts as MPEG Transport Stream (encoding)
jb@kdenlive.org [Thu, 8 Dec 2011 14:16:48 +0000 (15:16 +0100)]
mpegtsenc: recognize .mts as MPEG Transport Stream (encoding)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoAdd Escape 130 to the documentation
Paul B Mahol [Thu, 8 Dec 2011 12:13:42 +0000 (12:13 +0000)]
Add Escape 130 to the documentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoescape130: replace can_safely_read() by get_bits_left()
Michael Niedermayer [Thu, 8 Dec 2011 12:50:25 +0000 (13:50 +0100)]
escape130: replace can_safely_read() by get_bits_left()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoescape130: give all av_log() a context
Michael Niedermayer [Thu, 8 Dec 2011 12:48:24 +0000 (13:48 +0100)]
escape130: give all av_log() a context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoescape130: The minimum read in and after decode_skip_count() is 4 bits.
Michael Niedermayer [Thu, 8 Dec 2011 12:43:01 +0000 (13:43 +0100)]
escape130: The minimum read in and after decode_skip_count() is 4 bits.
Thus we can check for 4 being available.
If the next block is skiped we need 4 bits to encode the skip. If the
next block is not skiped then we need 1 bit for the skip code and
at least 3 bits for the block.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoescape130: Check dimensions to be a multiple of the block size.
Michael Niedermayer [Thu, 8 Dec 2011 12:38:13 +0000 (13:38 +0100)]
escape130: Check dimensions to be a multiple of the block size.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoPass pointer to integer buffer instead of integer to memcpy
Mashiat Sarker Shakkhar [Thu, 8 Dec 2011 16:52:16 +0000 (22:52 +0600)]
Pass pointer to integer buffer instead of integer to memcpy

12 years agoSilence a warning when compiling Escape 130 decoder.
Carl Eugen Hoyos [Thu, 8 Dec 2011 16:14:47 +0000 (17:14 +0100)]
Silence a warning when compiling Escape 130 decoder.

Fixes:
libavcodec/escape130.c:177:17: warning: ISO C90 forbids mixed declarations and code

Reviewed-by: Paul B Mahol
12 years agoescape130: 10l for myself for not initializing y_base.
Michael Niedermayer [Thu, 8 Dec 2011 12:20:25 +0000 (13:20 +0100)]
escape130: 10l for myself for not initializing y_base.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavf: lower the log level of "parser not found".
Nicolas George [Thu, 8 Dec 2011 11:07:29 +0000 (12:07 +0100)]
lavf: lower the log level of "parser not found".

The information is relevant, but under normal circumstances
it raises far too many false alarms.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoescape130: Fix y_base handling, this fixes some artifacts, vissible in most videos.
Michael Niedermayer [Thu, 8 Dec 2011 05:00:19 +0000 (06:00 +0100)]
escape130: Fix y_base handling, this fixes some artifacts, vissible in most videos.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoescape130: make sure cliping is done on signed values.
Michael Niedermayer [Thu, 8 Dec 2011 04:59:36 +0000 (05:59 +0100)]
escape130: make sure cliping is done on signed values.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'richardpl/escape130'
Michael Niedermayer [Thu, 8 Dec 2011 04:47:00 +0000 (05:47 +0100)]
Merge remote-tracking branch 'richardpl/escape130'

* richardpl/escape130:
  escape130: fix colors
  escape130: remove trailing whitespace
  rpl: enable escape130 codec
  escape130: minimal effort to make it compile without warnings
  Escape 130 (RPL) decoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMark one colour as transparent in the gif image encoder
Carl Eugen Hoyos [Thu, 8 Dec 2011 01:48:31 +0000 (02:48 +0100)]
Mark one colour as transparent in the gif image encoder

if the input palette contains at least one colour
that is more than 50% transparent.

Fixes ticket #715.

12 years agoDecode RGB ljpeg to RGB24.
Carl Eugen Hoyos [Thu, 8 Dec 2011 01:17:44 +0000 (02:17 +0100)]
Decode RGB ljpeg to RGB24.

No alpha channel is decoded, the output used to be completely transparent.

12 years agoSupport decoding 56 byte BMP Bitmap Information Header.
Carl Eugen Hoyos [Thu, 8 Dec 2011 01:14:36 +0000 (02:14 +0100)]
Support decoding 56 byte BMP Bitmap Information Header.

Fixes ticket #719.

12 years agopthread: fixed thread initialization issues related to thread-safe buffer allocator
Anatoliy Wasserman [Wed, 7 Dec 2011 22:14:49 +0000 (14:14 -0800)]
pthread: fixed thread initialization issues related to thread-safe buffer allocator

Signed-off-by: Anatoliy Wasserman <anatoliy.wasserman@yandex.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'shariman/wmall'
Michael Niedermayer [Wed, 7 Dec 2011 23:37:55 +0000 (00:37 +0100)]
Merge remote-tracking branch 'shariman/wmall'

* shariman/wmall:
  Partially fix CDLMS prediction

Conflicts:
libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 7 Dec 2011 23:23:37 +0000 (00:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  drawtext: remove typo
  pcm-mpeg: implement new audio decoding api
  w32thread: port fixes to pthread_cond_broadcast() from x264.
  doc: add editor configuration section with Vim and Emacs settings
  dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9
  avformat/utils: Drop unused goto label.
  doxygen: Replace '\' by '@' in Doxygen markup tags.
  cosmetics: drop some completely pointless parentheses
  cljr: simplify CLJRContext
  drawtext: introduce rand(min, max)
  drawtext: introduce explicit draw/hide variable
  rtmp: Use nb_invokes for all invoke commands

Conflicts:
libavcodec/mpegvideo.c
libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoPartially fix CDLMS prediction
Mashiat Sarker Shakkhar [Wed, 7 Dec 2011 21:57:21 +0000 (03:57 +0600)]
Partially fix CDLMS prediction

12 years agoOne last try to get zmbv test to work across all fate machines.
Reimar Döffinger [Wed, 7 Dec 2011 20:45:19 +0000 (21:45 +0100)]
One last try to get zmbv test to work across all fate machines.

Change compression level to 0 this time.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoqtrledec: Fix artifacts in tickets/226/qt_rle_bw.mov
Michael Niedermayer [Wed, 7 Dec 2011 19:29:38 +0000 (20:29 +0100)]
qtrledec: Fix artifacts in tickets/226/qt_rle_bw.mov

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoqtrle.c: Fix for ticket #226.
Alexis Ballier [Wed, 7 Dec 2011 12:27:20 +0000 (09:27 -0300)]
qtrle.c: Fix for ticket #226.

In 1bpp mode, interpret skip&0x80 as "start a new line" instead of "go to next line", this is almost the same except for the first line which was always skipped before and caused to try to write an extra line at the end of the frame (ticket #226).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodrawtext: remove typo
Luca Barbato [Wed, 7 Dec 2011 19:30:55 +0000 (20:30 +0100)]
drawtext: remove typo

It slipped through the last two iterations.

12 years agopcm-mpeg: implement new audio decoding api
Hendrik Leppkes [Sun, 4 Dec 2011 22:15:51 +0000 (23:15 +0100)]
pcm-mpeg: implement new audio decoding api

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years agow32thread: port fixes to pthread_cond_broadcast() from x264.
Ronald S. Bultje [Wed, 7 Dec 2011 04:42:55 +0000 (20:42 -0800)]
w32thread: port fixes to pthread_cond_broadcast() from x264.

12 years agodoc: add editor configuration section with Vim and Emacs settings
Diego Biurrun [Mon, 5 Dec 2011 12:18:27 +0000 (13:18 +0100)]
doc: add editor configuration section with Vim and Emacs settings

based on a patch by Victor Vasiliev, vasilvv gmail com

12 years agodxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9
Rafaël Carré [Wed, 7 Dec 2011 15:23:52 +0000 (10:23 -0500)]
dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agoMAINTAINERS: ask maintainers to help keep their entries in this file upto date.
Michael Niedermayer [Wed, 7 Dec 2011 14:47:19 +0000 (15:47 +0100)]
MAINTAINERS: ask maintainers to help keep their entries in this file upto date.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agogxfenc: support timecode option
Matthieu Bouron [Tue, 6 Dec 2011 20:56:01 +0000 (21:56 +0100)]
gxfenc: support timecode option

Reviewed-by: Baptiste Coudurier
12 years agoavformat/utils: Drop unused goto label.
Diego Biurrun [Wed, 7 Dec 2011 10:30:07 +0000 (11:30 +0100)]
avformat/utils: Drop unused goto label.

libavformat/utils.c:2165:2: warning: label ‘fail’ defined but not used

12 years agodoxygen: Replace '\' by '@' in Doxygen markup tags.
Diego Biurrun [Wed, 7 Dec 2011 12:43:36 +0000 (13:43 +0100)]
doxygen: Replace '\' by '@' in Doxygen markup tags.

12 years agocosmetics: drop some completely pointless parentheses
Diego Biurrun [Wed, 7 Dec 2011 12:48:58 +0000 (13:48 +0100)]
cosmetics: drop some completely pointless parentheses

12 years ago cljr: simplify CLJRContext
Paul B. Mahol [Tue, 6 Dec 2011 17:45:37 +0000 (17:45 +0000)]
 cljr: simplify CLJRContext

There is no need to have delta, offset and gb in CLJRContext.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
12 years agodrawtext: introduce rand(min, max)
Luca Barbato [Sun, 4 Dec 2011 23:56:21 +0000 (00:56 +0100)]
drawtext: introduce rand(min, max)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agodrawtext: introduce explicit draw/hide variable
Luca Barbato [Sun, 4 Dec 2011 20:13:56 +0000 (21:13 +0100)]
drawtext: introduce explicit draw/hide variable

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agoDo not ignore full transparency when writing png palette.
Carl Eugen Hoyos [Wed, 7 Dec 2011 10:31:27 +0000 (11:31 +0100)]
Do not ignore full transparency when writing png palette.

This reverts r6689, "Make PNG produce correct 8-bit pictures".

12 years agortmp: Use nb_invokes for all invoke commands
Martin Storsjö [Mon, 5 Dec 2011 10:35:06 +0000 (12:35 +0200)]
rtmp: Use nb_invokes for all invoke commands

704af3e29c3ddbc22ac5c8f40e5a0f860d53ac4c broke publishing
of rtmp streams, at least publishing to Wowza servers.

This changes all invoke commands to use nb_invokes.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agomovenc: Always write EDTS when we are able to.
Michael Niedermayer [Wed, 7 Dec 2011 04:06:13 +0000 (05:06 +0100)]
movenc: Always write EDTS when we are able to.

Inspired by a patch from Michael Root
Idea-by: Baptiste Coudurier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'shariman/wmall'
Michael Niedermayer [Wed, 7 Dec 2011 03:49:42 +0000 (04:49 +0100)]
Merge remote-tracking branch 'shariman/wmall'

* shariman/wmall:
  Fix lms_update()
  Move num_lms reading out of a loop
  Use correct value for range
  Fix some int / int16_t / int32_t confusion
  Implement revert_mclms() and associated functions
  Fix two more int16_t vs. int confusion
  Init s->cdlms[][].recent to order - 1
  Add a size argument to dump_int_buffer()
  Get rid of logging that are not required anymore
  Fix some int vs. int16_t confusion

Conflicts:
libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoimg2: 10l typo
Michael Niedermayer [Wed, 7 Dec 2011 02:19:42 +0000 (03:19 +0100)]
img2: 10l typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoAllow auto-detection of ljpg images.
Carl Eugen Hoyos [Wed, 7 Dec 2011 01:32:59 +0000 (02:32 +0100)]
Allow auto-detection of ljpg images.

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 7 Dec 2011 01:04:00 +0000 (02:04 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Code cleanup - mpegvideo.c - 500-1000line
  rv40: NEON optimised weighted prediction
  rv40: NEON optimised chroma MC
  ARM: move NEON H264 chroma mc to a separate file
  rv34: NEON optimised inverse transform functions

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoh264: init prev_frame_num to -1 on init
Michael Niedermayer [Tue, 6 Dec 2011 21:41:24 +0000 (22:41 +0100)]
h264: init prev_frame_num to -1 on init
Fixes Ticket711

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoh264: Fix memleaks on close, reset more fields
Michael Niedermayer [Tue, 6 Dec 2011 21:40:43 +0000 (22:40 +0100)]
h264: Fix memleaks on close, reset more fields

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoFix 8BPS RGB32 output, the alpha channel was ignored.
Carl Eugen Hoyos [Tue, 6 Dec 2011 22:06:27 +0000 (23:06 +0100)]
Fix 8BPS RGB32 output, the alpha channel was ignored.

Reviewed-by: Roberto Togni
12 years agoCode cleanup - mpegvideo.c - 500-1000line
Konstantin Todorov [Mon, 5 Dec 2011 16:40:28 +0000 (18:40 +0200)]
Code cleanup - mpegvideo.c - 500-1000line

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 years agoChoose compression level 6 for zmbv test.
Reimar Döffinger [Tue, 6 Dec 2011 18:48:16 +0000 (19:48 +0100)]
Choose compression level 6 for zmbv test.

The default of 9 gives different results on different FATE systems.
However the zlib test using compression level 6 works, so
try this instead.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agomovdec: remove redundant size<=8 check.
Michael Niedermayer [Tue, 6 Dec 2011 16:40:40 +0000 (17:40 +0100)]
movdec: remove redundant size<=8 check.
Its checked a few lines below too.
The only difference is that empty atoms with size=0 will now get parsed too.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomovdec: Read extended 64bit size before the debug av_log() and only when there
Michael Niedermayer [Tue, 6 Dec 2011 16:35:52 +0000 (17:35 +0100)]
movdec: Read extended 64bit size before the debug av_log() and only when there
was enough space to read the 32bit size.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomovdec: Fix bad computed size for atoms with size 0 in MOV files
Mihnea Balta [Tue, 6 Dec 2011 07:29:47 +0000 (09:29 +0200)]
movdec: Fix bad computed size for atoms with size 0 in MOV files

The computed size doesn't contain the header size because it's already
skipped by incrementing total_size, but then it's skipped again in the
last line. The atom comes out 8 bytes short and the function
mov_read_chan() aborts the whole parsing process. I think the computed
size should be atom.size - total_size + 8.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomov: increase total_size only when it actually increases.
Michael Niedermayer [Tue, 6 Dec 2011 16:21:05 +0000 (17:21 +0100)]
mov: increase total_size only when it actually increases.
This is just cosmetic as the if() is always true.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomovenc: support spliting fragments based on bytesize instead of duration.
Michael Niedermayer [Tue, 6 Dec 2011 15:21:10 +0000 (16:21 +0100)]
movenc: support spliting fragments based on bytesize instead of duration.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomovenc: fragment support
Michael Niedermayer [Tue, 6 Dec 2011 15:15:35 +0000 (16:15 +0100)]
movenc: fragment support

Reviewed-by: Baptiste Coudurier
Tested-with-QT: Baptiste Coudurier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: Warn if filters poll & request frame behave wrongly.
Michael Niedermayer [Tue, 6 Dec 2011 15:01:21 +0000 (16:01 +0100)]
ffmpeg: Warn if filters poll & request frame behave wrongly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovsrc_life: fix comment in parse_rule()
Stefano Sabatini [Sun, 4 Dec 2011 22:49:03 +0000 (23:49 +0100)]
vsrc_life: fix comment in parse_rule()

12 years agovf_scale: give a clue in case of invalid expression self-reference
Stefano Sabatini [Sun, 4 Dec 2011 22:33:40 +0000 (23:33 +0100)]
vf_scale: give a clue in case of invalid expression self-reference

Address trac ticket #706.

12 years agorv40: NEON optimised weighted prediction
Janne Grunau [Mon, 5 Dec 2011 21:22:57 +0000 (21:22 +0000)]
rv40: NEON optimised weighted prediction

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agorv40: NEON optimised chroma MC
Janne Grunau [Mon, 5 Dec 2011 21:18:05 +0000 (21:18 +0000)]
rv40: NEON optimised chroma MC

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agoARM: move NEON H264 chroma mc to a separate file
Mans Rullgard [Tue, 6 Dec 2011 12:44:05 +0000 (12:44 +0000)]
ARM: move NEON H264 chroma mc to a separate file

This allows sharing code with the rv40 version of these functions.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agorv34: NEON optimised inverse transform functions
Janne Grunau [Sat, 24 Sep 2011 11:05:55 +0000 (13:05 +0200)]
rv34: NEON optimised inverse transform functions

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 6 Dec 2011 00:37:27 +0000 (01:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mov: Don't av_malloc(0).
  avconv: only allocate 1 AVFrame per input stream
  avconv: fix memleaks due to not freeing the AVFrame for audio
  h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg).
  misc Doxygen markup improvements
  doxygen: eliminate Qt-style doxygen syntax
  g722: Add a regression test for muxing/demuxing in wav
  g722: Change bits per sample to 4
  g722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample
  api-example: update to use avcodec_decode_audio4()
  avplay: use avcodec_decode_audio4()
  avplay: use a separate buffer for playing silence
  avformat: use avcodec_decode_audio4() in avformat_find_stream_info()
  avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()
  mov: Allow empty stts atom.
  doc: document preferred Doxygen syntax and make patcheck detect it

Conflicts:
avconv.c
ffplay.c
libavcodec/mlpdec.c
libavcodec/version.h
libavformat/mov.c
tests/codec-regression.sh
tests/fate/h264.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoDo not fail fatally if chan atom is too short.
Carl Eugen Hoyos [Mon, 5 Dec 2011 23:16:22 +0000 (00:16 +0100)]
Do not fail fatally if chan atom is too short.

12 years agoFix compilation for C++ applications
Gavin Kinsey [Mon, 5 Dec 2011 15:15:29 +0000 (15:15 +0000)]
Fix compilation for C++ applications

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomovdec: Fix parsing of a very last empty atom of size 8.
Michael Niedermayer [Mon, 5 Dec 2011 17:04:19 +0000 (18:04 +0100)]
movdec: Fix parsing of a very last empty atom of size 8.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoAdd tests for several encoders.
Reimar Döffinger [Tue, 29 Nov 2011 23:13:54 +0000 (00:13 +0100)]
Add tests for several encoders.

More specifically, PNG, v210, zlib and zmbv codecs.
zmbv needs vf_scale to be able to produce PAL8.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agovf_scale: support PAL8 output by producing BGR8.
Reimar Döffinger [Tue, 29 Nov 2011 23:06:25 +0000 (00:06 +0100)]
vf_scale: support PAL8 output by producing BGR8.

While quality is bad, PAL8 support is needed to allow testing some
encoders that only support PAL8 input.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoAdd coverage exclusions for test code.
Reimar Döffinger [Tue, 29 Nov 2011 21:01:09 +0000 (22:01 +0100)]
Add coverage exclusions for test code.

For some of the code e.g. doing timing measurements there is no
real point in running regression testing on it, thus it should
not be counted against coverage.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoAdd coverage support.
Reimar Döffinger [Tue, 29 Nov 2011 19:35:48 +0000 (20:35 +0100)]
Add coverage support.

Adds --enable-coverage to configure and a "coverage-html" make target.
The dependency stuff in the Makefile is a bit questionable, but the
best I could think of so far.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agomov: Don't av_malloc(0).
Alex Converse [Mon, 5 Dec 2011 00:38:05 +0000 (16:38 -0800)]
mov: Don't av_malloc(0).

malloc() is allowed to return NULL when zero is the argument. This
causes us to think malloc has failed and return AVERROR(ENOMEM). In
addition OS X malloc() returns an unfreeable non-NULL pointer for size
zero when alignment is greater than 16.

12 years agoavconv: only allocate 1 AVFrame per input stream
Justin Ruggles [Mon, 5 Dec 2011 16:49:38 +0000 (11:49 -0500)]
avconv: only allocate 1 AVFrame per input stream

This avoids allocating/freeing an AVFrame for each packet decode. It also
simplifies error handling in transcode_audio() and transcode_video().

12 years agoavconv: fix memleaks due to not freeing the AVFrame for audio
Justin Ruggles [Mon, 5 Dec 2011 15:36:54 +0000 (10:36 -0500)]
avconv: fix memleaks due to not freeing the AVFrame for audio

12 years agoh264-fate: remove -strict 1 except where necessary (mr4/5-tandberg).
Ronald S. Bultje [Sat, 26 Nov 2011 21:10:17 +0000 (13:10 -0800)]
h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg).

12 years agolavc: Mark fields that require av_opt_ptr()
Michael Niedermayer [Mon, 5 Dec 2011 12:23:17 +0000 (13:23 +0100)]
lavc: Mark fields that require av_opt_ptr()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavc: Fix sizeof(AVFrame) useability docs
Michael Niedermayer [Mon, 5 Dec 2011 12:22:46 +0000 (13:22 +0100)]
lavc: Fix sizeof(AVFrame) useability docs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavc: Document AVFrame av_opt_ptr() relation.
Michael Niedermayer [Mon, 5 Dec 2011 12:22:20 +0000 (13:22 +0100)]
lavc: Document AVFrame av_opt_ptr() relation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomisc Doxygen markup improvements
Diego Biurrun [Sun, 30 Oct 2011 18:10:50 +0000 (19:10 +0100)]
misc Doxygen markup improvements

12 years agodoxygen: eliminate Qt-style doxygen syntax
Diego Biurrun [Sun, 30 Oct 2011 17:27:33 +0000 (18:27 +0100)]
doxygen: eliminate Qt-style doxygen syntax

12 years agog722: Add a regression test for muxing/demuxing in wav
Martin Storsjö [Sat, 3 Dec 2011 22:58:31 +0000 (00:58 +0200)]
g722: Add a regression test for muxing/demuxing in wav

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agog722: Change bits per sample to 4
Sjoerd Simons [Thu, 1 Dec 2011 23:08:35 +0000 (01:08 +0200)]
g722: Change bits per sample to 4

Earlier, bits per sample was defined as 8, since
bits_per_coded_sample was used to indicate whether to ignore
the lower bits of the codeword, having values 6, 7 or 8.

g722 encodes 2 samples into one byte codeword, therefore the
bits per sample is 4. By changing this, the generated timestamps
for streams encoded with g722 become correct.

This makes timestamp generation for g722 data correct (both when
encoding and when demuxing from raw g722 files).

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agog722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample
Martin Storsjö [Sat, 3 Dec 2011 17:54:20 +0000 (19:54 +0200)]
g722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample

This avoids using bits_per_coded_sample for this information.
bits_per_coded_sample should be 4 for this codec normally,
since two samples are encoded into one 8 bit codeword.

In principle, this might be info that needs to be passed from
a demuxer, and in that case, a private AVOption isn't the best
choice, but no such samples are available at the moment, so
that use case is purely theoretical at the moment.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoffplay: Avoid directly accessing AVFrame fields that differ between forks.
Michael Niedermayer [Sat, 3 Dec 2011 20:21:30 +0000 (21:21 +0100)]
ffplay: Avoid directly accessing AVFrame fields that differ between forks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: Avoid directly accessing AVFrame fields that differ between forks.
Michael Niedermayer [Sat, 3 Dec 2011 20:20:50 +0000 (21:20 +0100)]
ffmpeg: Avoid directly accessing AVFrame fields that differ between forks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavc: Add a AVClass for AVFrames.
Michael Niedermayer [Sat, 3 Dec 2011 20:17:52 +0000 (21:17 +0100)]
lavc: Add a AVClass for AVFrames.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoav_opt: add av_opt_ptr() to return a pointer to a field of a object based on
Michael Niedermayer [Sat, 3 Dec 2011 20:16:46 +0000 (21:16 +0100)]
av_opt: add av_opt_ptr() to return a pointer to a field of a object based on
an AVClass

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: handle stream copy timebase selection for mp4 as if it had VFPS set.
Michael Niedermayer [Mon, 5 Dec 2011 02:19:28 +0000 (03:19 +0100)]
ffmpeg: handle stream copy timebase selection for mp4 as if it had VFPS set.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoapi-example: update to use avcodec_decode_audio4()
Justin Ruggles [Fri, 11 Nov 2011 20:44:41 +0000 (15:44 -0500)]
api-example: update to use avcodec_decode_audio4()

12 years agoavplay: use avcodec_decode_audio4()
Justin Ruggles [Wed, 12 Oct 2011 17:27:41 +0000 (13:27 -0400)]
avplay: use avcodec_decode_audio4()

12 years agoavplay: use a separate buffer for playing silence
Justin Ruggles [Tue, 11 Oct 2011 19:49:39 +0000 (15:49 -0400)]
avplay: use a separate buffer for playing silence

12 years agoavformat: use avcodec_decode_audio4() in avformat_find_stream_info()
Justin Ruggles [Wed, 2 Nov 2011 18:35:36 +0000 (14:35 -0400)]
avformat: use avcodec_decode_audio4() in avformat_find_stream_info()

12 years agoavconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()
Justin Ruggles [Mon, 21 Nov 2011 22:41:49 +0000 (17:41 -0500)]
avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()

12 years agomov: Allow empty stts atom.
Alex Converse [Sat, 3 Dec 2011 01:00:11 +0000 (17:00 -0800)]
mov: Allow empty stts atom.

Fixes regressions caused by 30c3d976

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 4 Dec 2011 23:11:57 +0000 (00:11 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  adpcmenc: cosmetics: pretty-printing
  ac3dec: cosmetics: pretty-printing
  yuv4mpeg: cosmetics: pretty-printing
  shorten: remove dead initialization
  roqvideodec: set AVFrame reference before reget_buffer.
  bmp: fix some 1bit samples.
  latmdec: add fate test for audio config change
  oma: PCM support
  oma: better format detection with small probe buffer
  oma: clearify ambiguous if condition
  wavpack: Properly clip samples during lossy decode
  Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
  Cleaned pixdesc.c file in libavutil
  zmbv.c: coding style clean-up.
  xan.c: coding style clean-up.
  mpegvideo.c: code cleanup - first 500 lines.

Conflicts:
Changelog
libavcodec/adpcmenc.c
libavcodec/bmp.c
libavcodec/zmbv.c
libavutil/log.c
libavutil/pixdesc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>