OSDN Git Service

coroid/ffmpeg_saccubus.git
13 years agoAdded oggpagesize option for Ogg encoding. Allows setting a preferred page size....
Andres Gonzalez [Thu, 27 Jan 2011 09:14:21 +0000 (10:14 +0100)]
Added oggpagesize option for Ogg encoding. Allows setting a preferred page size. When set, if an Ogg stream buffer has enough data, a page is made, instead of filling maximum-size pages.

13 years agoffmpeg: Fix -t with files that do not have any timestamps.
Michael Niedermayer [Tue, 10 May 2011 15:31:32 +0000 (17:31 +0200)]
ffmpeg: Fix -t with files that do not have any timestamps.

This for example fixes -t with some frext h264 reference streams.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoswscale: Fix scaling for unscaled dithered planar convertions.
Michael Niedermayer [Tue, 10 May 2011 12:40:05 +0000 (14:40 +0200)]
swscale: Fix scaling for unscaled dithered planar convertions.

This fixes some overflow in bright areas and ensures that the maximum brightness level is
mapped to the maximum without cliping and without showing dither patterens in flat max
brightness areas.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Tue, 10 May 2011 02:01:29 +0000 (04:01 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  mpegaudiodec: group #includes more sanely
  mpegaudio: remove #if 0 blocks
  ffmpeg.c: reset avoptions after each input/output file.
  ffmpeg.c: store per-output stream sws flags.
  mpegaudio: remove CONFIG_MPEGAUDIO_HP option
  mpegtsenc: Clear st->priv_data when freeing it
  udp: Fix receiving RTP data over multicast
  rtpproto: Remove an unused variable
  regtest: fix wma tests
NOT pulled:  mpegaudio: remove CONFIG_AUDIO_NONSHORT
  regtest: separate flags for encoding and decoding

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoseeking: Favor pkt->pos for generic index building where possible.
Michael Niedermayer [Tue, 10 May 2011 01:28:42 +0000 (03:28 +0200)]
seeking: Favor pkt->pos for generic index building where possible.

See [FFmpeg-devel] [PATCH] Only using st->parser->pos when doing?repacking in the parser.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoconfigure: Revert sdl hunk of 4fa18c56. This breaks OSX
Michael Niedermayer [Tue, 10 May 2011 01:22:04 +0000 (03:22 +0200)]
configure: Revert sdl hunk of 4fa18c56. This breaks OSX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agomem: Choose alignment at compile time depending on AVX enabledness.
Michael Niedermayer [Tue, 10 May 2011 01:15:42 +0000 (03:15 +0200)]
mem: Choose alignment at compile time depending on AVX enabledness.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoswscale: use Nbit code to handle !is16BPS(c->srcFormat) && is16BPS(c->dstFormat)
Michael Niedermayer [Mon, 9 May 2011 22:37:20 +0000 (00:37 +0200)]
swscale: use Nbit code to handle !is16BPS(c->srcFormat) && is16BPS(c->dstFormat)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoswscale: Support dither in is16BPS(c->srcFormat) && !is16BPS(c->dstFormat)
Michael Niedermayer [Mon, 9 May 2011 22:21:18 +0000 (00:21 +0200)]
swscale: Support dither in is16BPS(c->srcFormat) && !is16BPS(c->dstFormat)

This is done by just letting the Nbit code handle it, which now can do it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoswscale: support unscaled planar Nbit->8bit with non native endian source.
Michael Niedermayer [Mon, 9 May 2011 22:17:44 +0000 (00:17 +0200)]
swscale: support unscaled planar Nbit->8bit with non native endian source.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoswscale: fix unscaled yuv422p16be -> yuv422p10le
Michael Niedermayer [Mon, 9 May 2011 22:15:03 +0000 (00:15 +0200)]
swscale: fix unscaled yuv422p16be -> yuv422p10le
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoswscale: make DITHER_COPY() support non native endian source
Michael Niedermayer [Mon, 9 May 2011 22:06:36 +0000 (00:06 +0200)]
swscale: make DITHER_COPY() support non native endian source
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agompegaudiodec: group #includes more sanely
Mans Rullgard [Mon, 9 May 2011 12:55:24 +0000 (13:55 +0100)]
mpegaudiodec: group #includes more sanely

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agompegaudio: remove #if 0 blocks
Mans Rullgard [Mon, 9 May 2011 12:08:08 +0000 (13:08 +0100)]
mpegaudio: remove #if 0 blocks

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoswscale: factor shift out of DITHER_COPY().
Michael Niedermayer [Mon, 9 May 2011 20:02:44 +0000 (22:02 +0200)]
swscale: factor shift out of DITHER_COPY().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoswscale: factorize DITHER_COPY()
Michael Niedermayer [Mon, 9 May 2011 19:38:46 +0000 (21:38 +0200)]
swscale: factorize DITHER_COPY()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agofifo: use av_freep()
Michael Niedermayer [Mon, 9 May 2011 19:23:45 +0000 (21:23 +0200)]
fifo: use av_freep()

With this change libavutil uses av_freep() everywhere where it makes sense.
Remaining av_free() use in it has the used pointer become inaccessible quickly
soo zeroing makes no sense.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoffmpeg.c: reset avoptions after each input/output file.
Anton Khirnov [Sat, 7 May 2011 06:55:25 +0000 (08:55 +0200)]
ffmpeg.c: reset avoptions after each input/output file.

This is consistent with how all the other options work.

13 years agoffmpeg.c: store per-output stream sws flags.
Anton Khirnov [Mon, 9 May 2011 14:36:57 +0000 (16:36 +0200)]
ffmpeg.c: store per-output stream sws flags.

13 years agompegaudio: remove CONFIG_MPEGAUDIO_HP option
Mans Rullgard [Mon, 9 May 2011 11:40:37 +0000 (12:40 +0100)]
mpegaudio: remove CONFIG_MPEGAUDIO_HP option

The low quality mode is off by default and never tested.  The high
quality mode is also plenty fast enough.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agompegtsenc: Clear st->priv_data when freeing it
Martin Storsjö [Mon, 9 May 2011 13:29:01 +0000 (16:29 +0300)]
mpegtsenc: Clear st->priv_data when freeing it

If not cleared, the caller might try to free it.

Signed-off-by: Martin Storsjö <martin@martin.st>
13 years agoudp: Fix receiving RTP data over multicast
Martin Storsjö [Mon, 9 May 2011 13:56:56 +0000 (16:56 +0300)]
udp: Fix receiving RTP data over multicast

Earlier, AVIO_RDWR was handled as READ, and all the checks
for the AVIO_WRONLY flag explicitly meant the write-only case.
When changed from old AVIO/URL contants to AVIO_FLAG in
59d96941f0285a5, these comparisons were updated incorrectly, by
mapping checks for AVIO_WRONLY to checks for AVIO_FLAG_WRITE.

When receiving RTP over UDP, the urlcontext is opened with
READ_WRITE flags.

This patch updates the flag comparisons to check for the same
conditions as the code did prior to 59d96941f0285a5.

Signed-off-by: Martin Storsjö <martin@martin.st>
13 years agortpproto: Remove an unused variable
Martin Storsjö [Mon, 9 May 2011 13:50:03 +0000 (16:50 +0300)]
rtpproto: Remove an unused variable

Signed-off-by: Martin Storsjö <martin@martin.st>
13 years agompeg4videoenc: Support negative timestamps.
Michael Niedermayer [Mon, 9 May 2011 15:50:34 +0000 (17:50 +0200)]
mpeg4videoenc: Support negative timestamps.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoavienc: Update 2 debug statements to match the current code.
Michael Niedermayer [Mon, 9 May 2011 15:49:25 +0000 (17:49 +0200)]
avienc: Update 2 debug statements to match the current code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoavutil: add divide & modulo that round like unsigned ones do that is down.
Michael Niedermayer [Mon, 9 May 2011 15:47:22 +0000 (17:47 +0200)]
avutil: add divide & modulo that round like unsigned ones do that is down.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoh264probe: update to latest spec.
Michael Niedermayer [Mon, 9 May 2011 14:05:29 +0000 (16:05 +0200)]
h264probe: update to latest spec.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoregtest: fix wma tests
Mans Rullgard [Mon, 9 May 2011 11:00:56 +0000 (12:00 +0100)]
regtest: fix wma tests

This adds $DEC_OPTS to the wma decode commands, making tests pass
on systems where the bitexact flag is needed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agompegaudio: remove CONFIG_AUDIO_NONSHORT
Mans Rullgard [Sun, 8 May 2011 20:44:12 +0000 (21:44 +0100)]
mpegaudio: remove CONFIG_AUDIO_NONSHORT

This fake option cannot be enabled by normal means, and the
floating-point decoder should provide the higher quality this
option presumably was intended for.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoregtest: separate flags for encoding and decoding
Mans Rullgard [Sat, 7 May 2011 12:57:21 +0000 (13:57 +0100)]
regtest: separate flags for encoding and decoding

This separates encoding and decoding flags, and passes them together
with the related file argument instead of all at the start of the
command line.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Mon, 9 May 2011 02:27:07 +0000 (04:27 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  log: Fix an oob array read.
  cosmetics: trim trailing whitespace in postproc
  Ban strncpy() it's too easy to misuse.
  psymodel: Remove wrapper functions.
  aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.
  regtest: remove redundant flags in jpg test
  regtest: use run_ffmpeg in do_image_formats
  regtest: simplify encoding functions
  ffmpeg.c: check for interlaced flag in the correct place.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years agowtvdec: Avoid gmtime_r() it breaks compile on windows.
Michael Niedermayer [Mon, 9 May 2011 02:17:24 +0000 (04:17 +0200)]
wtvdec: Avoid gmtime_r() it breaks compile on windows.

Better solutions welcome, this is just a quick fix to unbreak compile.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agodeveloper.texi: update for git
Michael Niedermayer [Mon, 9 May 2011 02:04:24 +0000 (04:04 +0200)]
developer.texi: update for git
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoTypo fix.
Luca Barbato [Mon, 9 May 2011 02:02:57 +0000 (04:02 +0200)]
Typo fix.

13 years agoPatch checklist:Suggest adding a regression test
Michael Niedermayer [Mon, 9 May 2011 02:00:31 +0000 (04:00 +0200)]
Patch checklist:Suggest adding a regression test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agodoc:Partial update of our issue tracker doc. More work needed, volunteers welcome.
Michael Niedermayer [Mon, 9 May 2011 01:05:59 +0000 (03:05 +0200)]
doc:Partial update of our issue tracker doc. More work needed, volunteers welcome.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agowtv: calculate ole date correctly (is seconds since 1899-12-30)
Peter Ross [Sun, 8 May 2011 18:14:47 +0000 (20:14 +0200)]
wtv: calculate ole date correctly (is seconds since 1899-12-30)

13 years agowtv: detect ole date overflow
Peter Ross [Sun, 8 May 2011 18:13:59 +0000 (20:13 +0200)]
wtv: detect ole date overflow

13 years agoswscale: implement Nbit->non native endian 16bit. Fixes v210.
Michael Niedermayer [Sun, 8 May 2011 22:22:12 +0000 (00:22 +0200)]
swscale: implement Nbit->non native endian 16bit. Fixes v210.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agofate: add 9/10 BE pixdesc checksums
Michael Niedermayer [Sun, 8 May 2011 21:57:52 +0000 (23:57 +0200)]
fate: add 9/10 BE pixdesc checksums
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agolog: Fix an oob array read.
Alex Converse [Fri, 6 May 2011 05:33:31 +0000 (22:33 -0700)]
log: Fix an oob array read.

13 years agocosmetics: trim trailing whitespace in postproc
Alex Converse [Fri, 6 May 2011 05:33:30 +0000 (22:33 -0700)]
cosmetics: trim trailing whitespace in postproc

13 years agoBan strncpy() it's too easy to misuse.
Alex Converse [Tue, 3 May 2011 18:21:49 +0000 (11:21 -0700)]
Ban strncpy() it's too easy to misuse.

13 years agopsymodel: Remove wrapper functions.
Nathan Caldwell [Fri, 6 May 2011 07:19:52 +0000 (01:19 -0600)]
psymodel: Remove wrapper functions.

Instead use the function pointers directly.

13 years agoaacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and...
Nathan Caldwell [Fri, 6 May 2011 07:19:51 +0000 (01:19 -0600)]
aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.

13 years agopnmdec: reindent after the previous commit
Stefano Sabatini [Sat, 7 May 2011 22:50:08 +0000 (00:50 +0200)]
pnmdec: reindent after the previous commit

13 years agopnmdec: add support for mono images with non-space-separated pixel digits
Stefano Sabatini [Sat, 7 May 2011 22:47:14 +0000 (00:47 +0200)]
pnmdec: add support for mono images with non-space-separated pixel digits

When the file to decode contains a sequence of binary values like
"1101110...", decode_frame() was reading the sequence of digits like a
unique integer value, which was resulting in integer overflows.

The change add support for parsing non-space-separated pixel digits
for mono formats, in particular fix decoding of file battrace.pbm, and
fix trac issue #154.

13 years agoffv1enc: support PIX_FMT_YUV420P10 & PIX_FMT_YUV422P10
Michael Niedermayer [Sun, 8 May 2011 16:51:55 +0000 (18:51 +0200)]
ffv1enc: support PIX_FMT_YUV420P10 & PIX_FMT_YUV422P10
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agov210enc:clip values according to specifications
Baptiste Coudurier [Sun, 8 May 2011 15:58:20 +0000 (17:58 +0200)]
v210enc:clip values according to specifications
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agov210enc: switch to PIX_FMT_422P10
Baptiste Coudurier [Sun, 8 May 2011 15:57:54 +0000 (17:57 +0200)]
v210enc: switch to PIX_FMT_422P10
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agov210dec: switch to PIX_FMT_422P10
Baptiste Coudurier [Sun, 8 May 2011 15:54:20 +0000 (17:54 +0200)]
v210dec: switch to PIX_FMT_422P10
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoffv1: set internal frame defaults
Stefano Sabatini [Sun, 8 May 2011 17:26:22 +0000 (19:26 +0200)]
ffv1: set internal frame defaults

Another fix missed before the vsrc_buffer changes.

13 years agoswscale: 9,10 bits pixel format output support
Baptiste Coudurier [Sun, 8 May 2011 12:20:57 +0000 (14:20 +0200)]
swscale: 9,10 bits pixel format output support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoPIX_FMT_422P10 support
Baptiste Coudurier [Sun, 8 May 2011 12:06:04 +0000 (14:06 +0200)]
PIX_FMT_422P10 support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoadpcmenc:Optimize adpcm_ima_qt_compress_sample()
Michael Niedermayer [Sun, 8 May 2011 11:20:22 +0000 (13:20 +0200)]
adpcmenc:Optimize adpcm_ima_qt_compress_sample()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoadpcmenc: fix QT IMA ADPCM encoder
Baptiste Coudurier [Sun, 8 May 2011 11:15:48 +0000 (13:15 +0200)]
adpcmenc: fix QT IMA ADPCM encoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoadpcmdec: Fix QT IMA ADPCM decoder
Baptiste Coudurier [Sun, 8 May 2011 11:13:17 +0000 (13:13 +0200)]
adpcmdec: Fix QT IMA ADPCM decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoregtest: remove redundant flags in jpg test
Mans Rullgard [Sat, 7 May 2011 12:52:04 +0000 (13:52 +0100)]
regtest: remove redundant flags in jpg test

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoregtest: use run_ffmpeg in do_image_formats
Mans Rullgard [Sat, 7 May 2011 12:33:00 +0000 (13:33 +0100)]
regtest: use run_ffmpeg in do_image_formats

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoregtest: simplify encoding functions
Mans Rullgard [Sat, 7 May 2011 10:55:48 +0000 (11:55 +0100)]
regtest: simplify encoding functions

The video encoding options were needlessly split in two parameters
which are merged.  The do_audio_encoding function did not use its
second argument, so this can be removed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoffmpeg.c: check for interlaced flag in the correct place.
Anton Khirnov [Fri, 6 May 2011 15:59:15 +0000 (17:59 +0200)]
ffmpeg.c: check for interlaced flag in the correct place.

In the corresponding codec context, not global options storage.

13 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Sun, 8 May 2011 01:29:51 +0000 (03:29 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  drawtext: add documentation for the shadow parameters
  drawtext: add shadow support.
  drawtext: factor draw_glyphs.
  drawtext: fix and optimize yuv blend.
  drawtext: get rid of divisions in the inner loop.
  drawtext: simplify chroma blend and fix chroma alpha.
  lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo

Conflicts:
configure
libavfilter/avfilter.h
libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years agosvq1dec: simpify mean calculation.
Michael Niedermayer [Sat, 7 May 2011 23:26:43 +0000 (01:26 +0200)]
svq1dec: simpify mean calculation.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agosvq1dec: replace /2 by >>1
Michael Niedermayer [Sat, 7 May 2011 23:26:07 +0000 (01:26 +0200)]
svq1dec: replace /2 by >>1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agopnm: Fix spurious error message.
Michael Niedermayer [Sat, 7 May 2011 23:24:37 +0000 (01:24 +0200)]
pnm: Fix spurious error message.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agolibopenjpeg: set internal frame defaults
Stefano Sabatini [Sat, 7 May 2011 19:32:52 +0000 (21:32 +0200)]
libopenjpeg: set internal frame defaults

Fix ffmpeg decoding, which was broken after the recent changes in
vsrc_buffer.

13 years agoFix function pointer type to match function it is assigned.
Reimar Döffinger [Sat, 7 May 2011 18:11:49 +0000 (20:11 +0200)]
Fix function pointer type to match function it is assigned.

13 years agoStore pointers in a less messy way in SWSContext.
Reimar Döffinger [Sat, 7 May 2011 18:06:33 +0000 (20:06 +0200)]
Store pointers in a less messy way in SWSContext.

13 years agoRemove unused variable.
Reimar Döffinger [Sat, 7 May 2011 17:48:00 +0000 (19:48 +0200)]
Remove unused variable.

13 years agoReplace deprecated url_fseek by avio_seek.
Reimar Döffinger [Sat, 7 May 2011 17:42:36 +0000 (19:42 +0200)]
Replace deprecated url_fseek by avio_seek.

13 years agoMove ifdef to avoid unused variable warnings.
Reimar Döffinger [Sat, 7 May 2011 17:39:11 +0000 (19:39 +0200)]
Move ifdef to avoid unused variable warnings.

13 years agoRemove unused variables.
Reimar Döffinger [Sat, 7 May 2011 17:33:21 +0000 (19:33 +0200)]
Remove unused variables.

13 years agoFix printf format string, fixes a warning.
Reimar Döffinger [Sat, 7 May 2011 17:28:45 +0000 (19:28 +0200)]
Fix printf format string, fixes a warning.

13 years agoriffenc/ffmpeg: Fix stream copy
Michael Niedermayer [Sat, 7 May 2011 17:44:21 +0000 (19:44 +0200)]
riffenc/ffmpeg: Fix stream copy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoffplay: fix null pointer read when codec unavilable.
Michael Niedermayer [Sat, 7 May 2011 14:54:06 +0000 (16:54 +0200)]
ffplay: fix null pointer read when codec unavilable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoaacdec: add decode_channel_map overread check
Reimar Döffinger [Sat, 7 May 2011 15:49:42 +0000 (17:49 +0200)]
aacdec: add decode_channel_map overread check

All decode_channel_map calls together can easily read
more data than the amount of padding available.
Thus below patch adds an input length check before reading them.
Fixes some invalid reads with sample from
http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1138

13 years agoIncrease TS packet size detection buffer.
Reimar Döffinger [Sun, 24 Apr 2011 15:34:39 +0000 (17:34 +0200)]
Increase TS packet size detection buffer.

Fixes warning message with ticket #68.

13 years agoAssume some TS packet size instead of failing completely.
Reimar Döffinger [Sun, 24 Apr 2011 15:33:48 +0000 (17:33 +0200)]
Assume some TS packet size instead of failing completely.

Fixes ticket #68.

13 years agooggdec:Correct duration
jan gerber [Sat, 7 May 2011 13:31:04 +0000 (15:31 +0200)]
oggdec:Correct duration
Based on a patch by Reimar Döffinger.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoOnly add 1 byte to av_malloc(0) when it actually returned NULL
Michael Niedermayer [Sat, 7 May 2011 13:28:39 +0000 (15:28 +0200)]
Only add 1 byte to av_malloc(0) when it actually returned NULL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoMake av_realloc(0) behave like our av_malloc(0)
Michael Niedermayer [Sat, 7 May 2011 13:28:07 +0000 (15:28 +0200)]
Make av_realloc(0) behave like our av_malloc(0)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agovsrc_buffer: during init, print information about timebase and sample aspect ratio
Stefano Sabatini [Sat, 7 May 2011 10:44:18 +0000 (12:44 +0200)]
vsrc_buffer: during init, print information about timebase and sample aspect ratio

13 years agovsrc_buffer: simplify av_vsrc_buffer_add_frame*() interface
Stefano Sabatini [Mon, 2 May 2011 07:52:11 +0000 (09:52 +0200)]
vsrc_buffer: simplify av_vsrc_buffer_add_frame*() interface

Now that pix_fmt, width, and height are directly embedded in the AVFrame,
there is no need to pass these values as separate arguments.

13 years agolavc: set defaults in internal codec frames
Stefano Sabatini [Mon, 2 May 2011 00:15:15 +0000 (02:15 +0200)]
lavc: set defaults in internal codec frames

This is required specifically for setting frame->format to -1,
otherwise it will be set to 0 = PIX_FMT_YUV420P and code reading
the format from the output decoded frame will get misled.

In particular fix regressions occurring with the pending vsrc_buffer
patch.

13 years agoffmpeg: rename ost->pict_tmp to ost->resample_frame
Stefano Sabatini [Fri, 6 May 2011 09:30:27 +0000 (11:30 +0200)]
ffmpeg: rename ost->pict_tmp to ost->resample_frame

The new name is more consistent with the employed naming scheme, and
more meaningful.

13 years agoffmpeg: prefer dec/enc over ost/ist->st->codec in do_video_out()
Stefano Sabatini [Fri, 6 May 2011 09:14:15 +0000 (11:14 +0200)]
ffmpeg: prefer dec/enc over ost/ist->st->codec in do_video_out()

Compact code, improve readability.

13 years agoffmpeg: move resample_changed check within the #if !CONFIG_AVFILTER
Stefano Sabatini [Fri, 6 May 2011 09:10:02 +0000 (11:10 +0200)]
ffmpeg: move resample_changed check within the #if !CONFIG_AVFILTER

The check and the corresponding message in do_video_out() are
unnecessary in the libavfilter path, as a similar check and message
are performed within the buffer source.

13 years agoffmpeg: remove useless intermediary variable resample_dst in do_video_out()
Stefano Sabatini [Fri, 6 May 2011 09:06:58 +0000 (11:06 +0200)]
ffmpeg: remove useless intermediary variable resample_dst in do_video_out()

13 years agoffmpeg: simplify mid-stream reconfiguration when libavfilter is disabled
Stefano Sabatini [Mon, 2 May 2011 07:35:38 +0000 (09:35 +0200)]
ffmpeg: simplify mid-stream reconfiguration when libavfilter is disabled

Implement lazy initialization of the image resample context, so that
the initialization code does not need to be duplicated.

Also manage the case in which resample/size change mid-stream. For
each packet the code computes if resampling is needed.

Previously the resample check was done only at the initialization, in
case size/format changed and no resample was detected at the init
stage ffmpeg was silently exiting.

13 years agolavfi: add libavfilter/avcodec.h and avfilter_copy_frame_props()
Stefano Sabatini [Sun, 1 May 2011 12:47:05 +0000 (14:47 +0200)]
lavfi: add libavfilter/avcodec.h and avfilter_copy_frame_props()

avfilter_copy_frame_props() avoids code duplication and increases
robustness.

The added files libavfilter/avcodec.[ch] are used for containing
utilities useful for gluing togheter libavfilter and libavcodec.

13 years agolavc: add format field to AVFrame
Stefano Sabatini [Sun, 1 May 2011 12:10:20 +0000 (14:10 +0200)]
lavc: add format field to AVFrame

The format is a per-frame property, having it in AVFrame simplify the
operation of extraction of that information, since avoids the need to
access the codec/stream context.

13 years agolavc: add width and height fields to AVFrame
Stefano Sabatini [Sun, 1 May 2011 12:02:08 +0000 (14:02 +0200)]
lavc: add width and height fields to AVFrame

width and height are per-frame properties, setting these values in
AVFrame simplify the operation of extraction of that information,
since avoids the need to check the codec/stream context.

13 years agoUse MAP_FAILED to check for mmap failure instead of manually
Reimar Döffinger [Sat, 7 May 2011 08:00:03 +0000 (10:00 +0200)]
Use MAP_FAILED to check for mmap failure instead of manually
recreating the value.

13 years agodrawtext: add documentation for the shadow parameters
Stefano Sabatini [Sat, 2 Apr 2011 09:27:09 +0000 (11:27 +0200)]
drawtext: add documentation for the shadow parameters

Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years agodrawtext: add shadow support.
Michael Niedermayer [Tue, 22 Feb 2011 00:41:52 +0000 (01:41 +0100)]
drawtext: add shadow support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years agodrawtext: factor draw_glyphs.
Michael Niedermayer [Tue, 22 Feb 2011 00:11:35 +0000 (01:11 +0100)]
drawtext: factor draw_glyphs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years agodrawtext: fix and optimize yuv blend.
Michael Niedermayer [Mon, 21 Feb 2011 23:54:48 +0000 (00:54 +0100)]
drawtext: fix and optimize yuv blend.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years agodrawtext: get rid of divisions in the inner loop.
Michael Niedermayer [Mon, 21 Feb 2011 23:43:19 +0000 (00:43 +0100)]
drawtext: get rid of divisions in the inner loop.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years agodrawtext: simplify chroma blend and fix chroma alpha.
Michael Niedermayer [Mon, 21 Feb 2011 23:23:31 +0000 (00:23 +0100)]
drawtext: simplify chroma blend and fix chroma alpha.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years agolavfi: Port drawtext filter by Hemanth from the libavfilter soc repo
Stefano Sabatini [Mon, 21 Feb 2011 00:02:29 +0000 (01:02 +0100)]
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo

With the following additions:
* support to anti-aliased glyph rendering
* support to UTF-8 text and Unicode chars rendering
* support for RGB packed formats
* fix minor errors and typos in the filter description
* extend/clarify examples in the filter description

Signed-off-by: Anton Khirnov <anton@khirnov.net>