ffmpeg.git
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 26 Aug 2012 00:10:25 +0000 (02:10 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: fft: remove unused fft_dispatch* functions
  avconv: remove unused variable opt_shortest
  FATE: Add Canopus Lossless tests
  cllc: Pad swapped buffer

Conflicts:
ffmpeg_opt.c
tests/ref/fate/cllc-argb
tests/ref/fate/cllc-rgb

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoac3_probe: fix probing of non standard AC3
Michael Niedermayer [Sat, 25 Aug 2012 23:55:10 +0000 (01:55 +0200)]
ac3_probe: fix probing of non standard AC3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: fft: remove unused fft_dispatch* functions
Mans Rullgard [Sat, 25 Aug 2012 14:57:19 +0000 (15:57 +0100)]
x86: fft: remove unused fft_dispatch* functions

These functions are not used since the yasm conversion.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoavconv: remove unused variable opt_shortest
Mans Rullgard [Sat, 25 Aug 2012 10:41:13 +0000 (11:41 +0100)]
avconv: remove unused variable opt_shortest

This was replaced with a per-file value in 3c0df90.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agolavf: fix avio statistics for packets directly read without the buffer.
Michael Niedermayer [Sat, 25 Aug 2012 21:24:21 +0000 (23:24 +0200)]
lavf: fix avio statistics for packets directly read without the buffer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFATE: Add Canopus Lossless tests
Derek Buitenhuis [Thu, 23 Aug 2012 18:17:35 +0000 (18:17 +0000)]
FATE: Add Canopus Lossless tests

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agomatroska: Mark S_TEXT/UTF-8 as Subrip encoded subtitles.
Philip Langdale [Sun, 12 Aug 2012 03:29:20 +0000 (20:29 -0700)]
matroska: Mark S_TEXT/UTF-8 as Subrip encoded subtitles.

While not explicitly stated in the specs, the original author
has stated that S_TEXT/UTF-8 is expected to be text using Subrip
markup, but without Subrip in-band timing.

So, now that we have a decoder that conforms to this expectation,
let's use it.

Note that this change will impact tools that use libavformat. If
they expect srt subtitles to have CODEC_ID_TEXT, they must be
adjusted to expect CODEC_ID_SUBRIP. The actual content is, obviously,
unchanged.

Signed-off-by: Philip Langdale <philipl@overt.org>
7 years agoriff: fix remuxing of atrac3 in wav
Piotr Bandurski [Sat, 25 Aug 2012 11:52:20 +0000 (13:52 +0200)]
riff: fix remuxing of atrac3 in wav

The original codec expects 0 as bps or refuses to play the remuxed file.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: add some missing .long_name to codec_descriptors[]
Paul B Mahol [Sat, 25 Aug 2012 10:53:47 +0000 (10:53 +0000)]
lavc: add some missing .long_name to codec_descriptors[]

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoFix one of the problems with -codecs, -encoders and -decoders.
Carl Eugen Hoyos [Sat, 25 Aug 2012 06:49:23 +0000 (08:49 +0200)]
Fix one of the problems with -codecs, -encoders and -decoders.

7 years agocllc: Pad swapped buffer
Derek Buitenhuis [Sat, 25 Aug 2012 02:10:19 +0000 (22:10 -0400)]
cllc: Pad swapped buffer

The bitstream buffer must be padded, or the bitstream reader might
read over the end.

Fixes the following valgrind warning:
    Use of uninitialised value of size 8 at 0x591BAE: cllc_decode_frame (cllc.c:166)

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agodpx: 10 and 12 bit encoding
Georg Lippitsch [Fri, 24 Aug 2012 13:24:15 +0000 (15:24 +0200)]
dpx: 10 and 12 bit encoding

Encode GBRP10 pixel format into 10 bit DPX.
Encode GBRP12 pixel format into 12 bit DPX.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexamples/decoding_encoding.c: tell where the decoding output files are printed
Stefano Sabatini [Fri, 24 Aug 2012 15:15:51 +0000 (17:15 +0200)]
examples/decoding_encoding.c: tell where the decoding output files are printed

7 years agoexamples/muxing: update to the new avcodec_encode_video2() API
Stefano Sabatini [Tue, 21 Aug 2012 16:13:14 +0000 (18:13 +0200)]
examples/muxing: update to the new avcodec_encode_video2() API

7 years agodoc/developer: add "Adding files to the fate-suite dataset"
Michael Niedermayer [Fri, 24 Aug 2012 15:19:43 +0000 (17:19 +0200)]
doc/developer: add "Adding files to the fate-suite dataset"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 24 Aug 2012 12:51:51 +0000 (14:51 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  utvideodec: Fix single symbol mode decoding
  truespeech: drop useless casts
  libavcodec: drop bogus dependencies from mpc[78] and qdm2
  mpegaudio: move ff_mpa_enwindow to a separate file
  AVOptions: store defaults for INT64 options in int64 union member.

Conflicts:
libavcodec/Makefile
libavfilter/af_asyncts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93'
Michael Niedermayer [Fri, 24 Aug 2012 12:22:38 +0000 (14:22 +0200)]
Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93'

* commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93': (21 commits)
  cmdutils: fix a memleak when specifying an option twice.
  x86: mpegvideo: more sensible names for optimization file and init function
  x86: mpegvideoenc: Split optimizations off into a separate file
  dnxhdenc: x86: more sensible names for optimization file and init function
  svq1/svq3: Move common code out of SVQ1 decoder-specific file
  dirac: add Comments and references to the standard
  lavr: x86: optimized 6-channel flt to fltp conversion
  lavr: x86: optimized 2-channel flt to fltp conversion
  lavr: x86: optimized 6-channel flt to s16p conversion
  lavr: x86: optimized 2-channel flt to s16p conversion
  lavr: x86: optimized 6-channel s16 to fltp conversion
  lavr: x86: optimized 2-channel s16 to fltp conversion
  lavr: x86: optimized 6-channel s16 to s16p conversion
  lavr: x86: optimized 2-channel s16 to s16p conversion
  lavr: x86: optimized 2-channel fltp to flt conversion
  lavr: x86: optimized 6-channel fltp to s16 conversion
  lavr: x86: optimized 2-channel fltp to s16 conversion
  lavr: x86: optimized 6-channel s16p to flt conversion
  lavr: x86: optimized 2-channel s16p to flt conversion
  lavr: x86: optimized 6-channel s16p to s16 conversion
  ...

Conflicts:
libavcodec/dirac.c
libavcodec/mpegvideo.h
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortpdec_xiph: switch to av_assert()
Michael Niedermayer [Fri, 24 Aug 2012 03:39:30 +0000 (05:39 +0200)]
rtpdec_xiph: switch to av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/asetpts,setpts: rework debug log
Stefano Sabatini [Thu, 23 Aug 2012 10:31:47 +0000 (12:31 +0200)]
lavfi/asetpts,setpts: rework debug log

Show more information, and only the information stored in the values
array. Improve debugging usefulness.

7 years agolavfi/asetpts,setpts: add variables T, STARTT, PREV_INT and PREV_OUTT
Stefano Sabatini [Thu, 23 Aug 2012 10:29:20 +0000 (12:29 +0200)]
lavfi/asetpts,setpts: add variables T, STARTT, PREV_INT and PREV_OUTT

7 years agoutvideodec: Fix single symbol mode decoding
Jan Ekström [Thu, 23 Aug 2012 20:32:06 +0000 (23:32 +0300)]
utvideodec: Fix single symbol mode decoding

Put the zero length check in place of code that was never used
during decoding, as zero-length slices were generally refused
in decode_frame().

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
7 years agodoc/filters: itemize examples for *settb filters
Stefano Sabatini [Thu, 23 Aug 2012 09:56:35 +0000 (11:56 +0200)]
doc/filters: itemize examples for *settb filters

7 years agodoc/filters: itemize examples for *setpts filters
Stefano Sabatini [Thu, 23 Aug 2012 09:52:45 +0000 (11:52 +0200)]
doc/filters: itemize examples for *setpts filters

7 years agodoc/filters: move *setpts and *settb filters to the multimedia filters section
Stefano Sabatini [Thu, 23 Aug 2012 09:48:23 +0000 (11:48 +0200)]
doc/filters: move *setpts and *settb filters to the multimedia filters section

Since audio and video filters are explained together and share most code,
the multimedia filters section seems more fitting.

7 years agolavfi: rename vf_setpts.c to f_setpts.c
Stefano Sabatini [Thu, 23 Aug 2012 09:46:55 +0000 (11:46 +0200)]
lavfi: rename vf_setpts.c to f_setpts.c

The file contains the asetpts audio filter.

7 years agolavc/dvdsubenc: check the type of rectangles.
Nicolas George [Sun, 19 Aug 2012 17:10:48 +0000 (19:10 +0200)]
lavc/dvdsubenc: check the type of rectangles.

Avoid a crash if a text rectangle is provided.
Fix the segfault reported in trac ticket #1661.

7 years agotruespeech: drop useless casts
Mans Rullgard [Thu, 23 Aug 2012 18:47:29 +0000 (19:47 +0100)]
truespeech: drop useless casts

These values already have the correct types.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agolibavcodec: drop bogus dependencies from mpc[78] and qdm2
Mans Rullgard [Thu, 23 Aug 2012 17:48:13 +0000 (18:48 +0100)]
libavcodec: drop bogus dependencies from mpc[78] and qdm2

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agompegaudio: move ff_mpa_enwindow to a separate file
Mans Rullgard [Thu, 23 Aug 2012 17:47:49 +0000 (18:47 +0100)]
mpegaudio: move ff_mpa_enwindow to a separate file

This table is used only by mpegaudiodsp and mpegaudioenc.  Separating
it allows dropping some dependencies from mpc[78] and qdm2.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agocmdutils: fix a memleak when specifying an option twice.
Anton Khirnov [Thu, 23 Aug 2012 07:18:06 +0000 (09:18 +0200)]
cmdutils: fix a memleak when specifying an option twice.

7 years agoAVOptions: store defaults for INT64 options in int64 union member.
Anton Khirnov [Wed, 22 Aug 2012 08:07:54 +0000 (10:07 +0200)]
AVOptions: store defaults for INT64 options in int64 union member.

Double does not have enough precision to represent all int64 numbers
exactly.

7 years agolavf/utils: Try to unwrap pts/dts so as to minimize wraps
Michael Niedermayer [Fri, 24 Aug 2012 01:08:51 +0000 (03:08 +0200)]
lavf/utils: Try to unwrap pts/dts so as to minimize wraps

Based on code by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/utils: run update_initial_timestamps() outside some if()
Michael Niedermayer [Fri, 24 Aug 2012 01:07:03 +0000 (03:07 +0200)]
lavf/utils: run update_initial_timestamps() outside some if()

This way it gets executed earlier and updated timestamps become available earlier.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: mpegvideo: more sensible names for optimization file and init function
Diego Biurrun [Mon, 13 Aug 2012 11:13:57 +0000 (13:13 +0200)]
x86: mpegvideo: more sensible names for optimization file and init function

7 years agox86: mpegvideoenc: Split optimizations off into a separate file
Diego Biurrun [Mon, 13 Aug 2012 11:11:38 +0000 (13:11 +0200)]
x86: mpegvideoenc: Split optimizations off into a separate file

7 years agodnxhdenc: x86: more sensible names for optimization file and init function
Diego Biurrun [Mon, 13 Aug 2012 10:20:07 +0000 (12:20 +0200)]
dnxhdenc: x86: more sensible names for optimization file and init function

7 years agosvq1/svq3: Move common code out of SVQ1 decoder-specific file
Diego Biurrun [Sun, 19 Aug 2012 20:53:28 +0000 (22:53 +0200)]
svq1/svq3: Move common code out of SVQ1 decoder-specific file

7 years agodirac: add Comments and references to the standard
Jordi Ortiz [Wed, 22 Aug 2012 11:24:34 +0000 (13:24 +0200)]
dirac: add Comments and references to the standard

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agolavr: x86: optimized 6-channel flt to fltp conversion
Justin Ruggles [Wed, 2 May 2012 22:27:30 +0000 (18:27 -0400)]
lavr: x86: optimized 6-channel flt to fltp conversion

7 years agolavr: x86: optimized 2-channel flt to fltp conversion
Justin Ruggles [Wed, 2 May 2012 22:26:01 +0000 (18:26 -0400)]
lavr: x86: optimized 2-channel flt to fltp conversion

7 years agolavr: x86: optimized 6-channel flt to s16p conversion
Justin Ruggles [Wed, 2 May 2012 22:23:20 +0000 (18:23 -0400)]
lavr: x86: optimized 6-channel flt to s16p conversion

7 years agolavr: x86: optimized 2-channel flt to s16p conversion
Justin Ruggles [Wed, 2 May 2012 22:21:26 +0000 (18:21 -0400)]
lavr: x86: optimized 2-channel flt to s16p conversion

7 years agolavr: x86: optimized 6-channel s16 to fltp conversion
Justin Ruggles [Wed, 2 May 2012 22:03:11 +0000 (18:03 -0400)]
lavr: x86: optimized 6-channel s16 to fltp conversion

7 years agolavr: x86: optimized 2-channel s16 to fltp conversion
Justin Ruggles [Wed, 2 May 2012 21:57:56 +0000 (17:57 -0400)]
lavr: x86: optimized 2-channel s16 to fltp conversion

7 years agolavr: x86: optimized 6-channel s16 to s16p conversion
Justin Ruggles [Wed, 2 May 2012 21:54:56 +0000 (17:54 -0400)]
lavr: x86: optimized 6-channel s16 to s16p conversion

7 years agolavr: x86: optimized 2-channel s16 to s16p conversion
Justin Ruggles [Wed, 2 May 2012 21:53:15 +0000 (17:53 -0400)]
lavr: x86: optimized 2-channel s16 to s16p conversion

7 years agolavr: x86: optimized 2-channel fltp to flt conversion
Justin Ruggles [Wed, 2 May 2012 20:32:08 +0000 (16:32 -0400)]
lavr: x86: optimized 2-channel fltp to flt conversion

7 years agolavr: x86: optimized 6-channel fltp to s16 conversion
Justin Ruggles [Wed, 2 May 2012 20:27:11 +0000 (16:27 -0400)]
lavr: x86: optimized 6-channel fltp to s16 conversion

7 years agolavr: x86: optimized 2-channel fltp to s16 conversion
Justin Ruggles [Wed, 2 May 2012 19:50:46 +0000 (15:50 -0400)]
lavr: x86: optimized 2-channel fltp to s16 conversion

7 years agolavr: x86: optimized 6-channel s16p to flt conversion
Justin Ruggles [Wed, 2 May 2012 19:45:29 +0000 (15:45 -0400)]
lavr: x86: optimized 6-channel s16p to flt conversion

7 years agolavr: x86: optimized 2-channel s16p to flt conversion
Justin Ruggles [Wed, 2 May 2012 19:38:11 +0000 (15:38 -0400)]
lavr: x86: optimized 2-channel s16p to flt conversion

7 years agolavr: x86: optimized 6-channel s16p to s16 conversion
Justin Ruggles [Wed, 2 May 2012 19:36:43 +0000 (15:36 -0400)]
lavr: x86: optimized 6-channel s16p to s16 conversion

7 years agolavr: x86: optimized 2-channel s16p to s16 conversion
Justin Ruggles [Wed, 2 May 2012 19:32:08 +0000 (15:32 -0400)]
lavr: x86: optimized 2-channel s16p to s16 conversion

7 years agoffmpeg: fix wrap correction code.
Michael Niedermayer [Thu, 23 Aug 2012 23:39:32 +0000 (01:39 +0200)]
ffmpeg: fix wrap correction code.

The code failed with negative timestamps due to using unsigned numbers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpeg: fix fliping with emu edges.
Michael Niedermayer [Thu, 23 Aug 2012 19:53:10 +0000 (21:53 +0200)]
mjpeg: fix fliping with emu edges.

Fixes Ticket121

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix partially hidden macroblocks for 10-bit DNxHD.
Joseph Artsimovich [Thu, 23 Aug 2012 13:51:28 +0000 (14:51 +0100)]
Fix partially hidden macroblocks for 10-bit DNxHD.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: more than 8 bit per RGB channel
Georg Lippitsch [Thu, 23 Aug 2012 13:54:40 +0000 (15:54 +0200)]
ffv1: more than 8 bit per RGB channel

Add support for GBRP9, GBRP10, GBRP12 and GBRP14 pix formats in ffv1.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolagarith: fix alignment on buffers passed into prediction dsp code.
Michael Niedermayer [Thu, 23 Aug 2012 17:03:57 +0000 (19:03 +0200)]
lagarith: fix alignment on buffers passed into prediction dsp code.

This should fix issues with direct rendering

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/ape: Fix stream duration calculation
jamal [Thu, 23 Aug 2012 02:53:08 +0000 (23:53 -0300)]
lavf/ape: Fix stream duration calculation

Fixes ticket #1662

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg4audio: dont take the SBR flag too serious.
Michael Niedermayer [Thu, 23 Aug 2012 04:35:30 +0000 (06:35 +0200)]
mpeg4audio: dont take the SBR flag too serious.

Fixes Ticket1049

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 23 Aug 2012 12:23:08 +0000 (14:23 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/APIchanges: add an entry for codec descriptors.
  vorbisenc: set AVCodecContext.bit_rate to 0
  vorbisenc: fix quality parameter
  FATE: add ALAC encoding tests
  lpc: fix alignment of windowed samples for odd maximum LPC order
  alacenc: use s16p sample format as input
  alacenc: remove unneeded sample_fmt check
  alacenc: fix max_frame_size calculation for the final frame
  adpcm_swf: Use correct sample offsets when using trellis.
  rtmp: support strict rtmp servers
  mjpegdec: support AVRn interlaced
  x86: remove FASTDIV inline asm

Conflicts:
doc/APIchanges
libavcodec/mjpegdec.c
libavcodec/vorbisenc.c
libavutil/x86/intmath.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/APIchanges: add an entry for codec descriptors.
Anton Khirnov [Wed, 22 Aug 2012 08:37:35 +0000 (10:37 +0200)]
doc/APIchanges: add an entry for codec descriptors.

Also fill in missing dates and hashes.

7 years agovorbisenc: set AVCodecContext.bit_rate to 0
Justin Ruggles [Mon, 20 Aug 2012 17:35:48 +0000 (13:35 -0400)]
vorbisenc: set AVCodecContext.bit_rate to 0

The Vorbis encoder is always VBR.

7 years agovorbisenc: fix quality parameter
Justin Ruggles [Mon, 20 Aug 2012 17:30:44 +0000 (13:30 -0400)]
vorbisenc: fix quality parameter

This generates output with bitrates similar to libvorbis for a given quality
value.

7 years agolavfi: free partial audio buffers when destroying links.
Nicolas George [Wed, 22 Aug 2012 21:31:49 +0000 (23:31 +0200)]
lavfi: free partial audio buffers when destroying links.

Fix a memleak that the recent change of architecture made
more likely to happen.

7 years agoFATE: add ALAC encoding tests
Justin Ruggles [Tue, 21 Aug 2012 16:48:23 +0000 (12:48 -0400)]
FATE: add ALAC encoding tests

7 years agolpc: fix alignment of windowed samples for odd maximum LPC order
Justin Ruggles [Tue, 21 Aug 2012 16:29:11 +0000 (12:29 -0400)]
lpc: fix alignment of windowed samples for odd maximum LPC order

Fixes crash on x86 due to alignment requirements for w_data in
lpc_apply_welch_window_sse2().

7 years agoalacenc: use s16p sample format as input
Justin Ruggles [Tue, 21 Aug 2012 13:21:56 +0000 (09:21 -0400)]
alacenc: use s16p sample format as input

7 years agoalacenc: remove unneeded sample_fmt check
Justin Ruggles [Tue, 21 Aug 2012 15:27:34 +0000 (11:27 -0400)]
alacenc: remove unneeded sample_fmt check

7 years agoalacenc: fix max_frame_size calculation for the final frame
Justin Ruggles [Tue, 21 Aug 2012 15:29:37 +0000 (11:29 -0400)]
alacenc: fix max_frame_size calculation for the final frame

7 years agoFATE: Add Canopus Lossless tests
Derek Buitenhuis [Wed, 22 Aug 2012 19:33:32 +0000 (15:33 -0400)]
FATE: Add Canopus Lossless tests

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutvideoenc: use dsp.sub_hfyu_median_prediction
Michael Niedermayer [Wed, 22 Aug 2012 14:17:31 +0000 (16:17 +0200)]
utvideoenc: use dsp.sub_hfyu_median_prediction

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutvideoenc: align mangled buffer starts.
Michael Niedermayer [Wed, 22 Aug 2012 14:13:12 +0000 (16:13 +0200)]
utvideoenc: align mangled buffer starts.

This is essential for fast SIMD accesses.
The same should be done with the predict output.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutvideoenc: drop step
Michael Niedermayer [Wed, 22 Aug 2012 13:40:17 +0000 (15:40 +0200)]
utvideoenc: drop step

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutvideoenc: avoid writing into the input picture.
Michael Niedermayer [Wed, 22 Aug 2012 13:37:28 +0000 (15:37 +0200)]
utvideoenc: avoid writing into the input picture.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutvideoenc: use ff_generate_len()
Michael Niedermayer [Wed, 22 Aug 2012 02:02:38 +0000 (04:02 +0200)]
utvideoenc: use ff_generate_len()

19% faster
smaller files
this may also fix possible integer overflows due to previous 32bit useage

Tested with libutvideo and our utvideo decoder, this patch does not change
decoder output in the test

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/overlay: fix return values.
Nicolas George [Mon, 20 Aug 2012 17:19:16 +0000 (19:19 +0200)]
lavfi/overlay: fix return values.

They were only roughly adapted when error return was
added to the push functions.

7 years agolavfi/split: handle closed outputs.
Nicolas George [Mon, 20 Aug 2012 17:18:46 +0000 (19:18 +0200)]
lavfi/split: handle closed outputs.

Return AVERROR_EOF if all outputs are closed.

7 years agoffmpeg: use close_output_stream more systematically.
Nicolas George [Mon, 20 Aug 2012 09:08:34 +0000 (11:08 +0200)]
ffmpeg: use close_output_stream more systematically.

7 years agoffmpeg: move close_output_stream earlier.
Nicolas George [Mon, 20 Aug 2012 08:57:18 +0000 (10:57 +0200)]
ffmpeg: move close_output_stream earlier.

It will avoid a forward declaration.

7 years agoffmpeg: make decoding_needed a counter.
Nicolas George [Sun, 19 Aug 2012 21:59:41 +0000 (23:59 +0200)]
ffmpeg: make decoding_needed a counter.

7 years agolavfi: add a closed field to AVFilerLink.
Nicolas George [Sun, 19 Aug 2012 17:26:58 +0000 (19:26 +0200)]
lavfi: add a closed field to AVFilerLink.

It will help forward errors and maintain consistency.

7 years agoffmpeg: use AV_BUFFERSRC_FLAG_PUSH.
Nicolas George [Sun, 19 Aug 2012 16:08:40 +0000 (18:08 +0200)]
ffmpeg: use AV_BUFFERSRC_FLAG_PUSH.

It reduces the lifespan of buffers in filter graphs,
and therefore the memory consumption.

7 years agoadpcm_swf: Use correct sample offsets when using trellis.
Justin Ruggles [Mon, 20 Aug 2012 16:18:58 +0000 (12:18 -0400)]
adpcm_swf: Use correct sample offsets when using trellis.

Fixes invalid reads when encoding mono streams when trellis is used.

7 years agortmp: support strict rtmp servers
Samuel Pitoiset [Sun, 19 Aug 2012 11:02:23 +0000 (13:02 +0200)]
rtmp: support strict rtmp servers

In order to send or receive a stream FCPublish, FCSubscribe and _checkbw
are completely optional and often not implemented. releaseStream over a
non-existen stream might report an error instead of being silent.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agomjpegdec: support AVRn interlaced
Michael Niedermayer [Fri, 10 Aug 2012 13:47:07 +0000 (15:47 +0200)]
mjpegdec: support AVRn interlaced

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agohuffman/huffyuv: move lorens huffman table generation code to huffman.c/h
Michael Niedermayer [Wed, 22 Aug 2012 01:57:45 +0000 (03:57 +0200)]
huffman/huffyuv: move lorens huffman table generation code to huffman.c/h

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutvideoenc: optimize and simplify mangle_rgb_planes
Michael Niedermayer [Wed, 22 Aug 2012 00:47:32 +0000 (02:47 +0200)]
utvideoenc: optimize and simplify mangle_rgb_planes

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: remove FASTDIV inline asm
Mans Rullgard [Sat, 18 Aug 2012 19:22:10 +0000 (20:22 +0100)]
x86: remove FASTDIV inline asm

GCC 4.3 and later do the right thing with the plain C code.  Earlier
versions in 32-bit mode generate one extra instruction, needlessly
zeroing what would be the high half of the shifted value.  At least
two gcc configurations miscompile the inline asm in some situations.

In 64-bit mode, all gcc versions generate imul r64, r64 followed by
shr.  On Intel i7 and later, this imul is faster 32-bit mul.  On
older Intel and all AMD, it is slightly slower.  On Atom it is much
slower.

Considering where the FASTDIV macro is used, any overall negative
performance impact of this change should be negligible.  If anyone
cares, they should file a bug against gcc and get the instruction
selection fixed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 22 Aug 2012 12:37:03 +0000 (14:37 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: x86: Only compile mpegvideo optimizations when necessary
  configure: Drop fastdiv option
  build: Make the E-AC-3 encoder select the AC-3 encoder
  fate: flac: Only run tests requiring samples when samples are available

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexamples/decoding_encoding: flush audio frames in the encoder
Stefano Sabatini [Tue, 21 Aug 2012 20:28:55 +0000 (22:28 +0200)]
examples/decoding_encoding: flush audio frames in the encoder

7 years agoexamples/decoding_encoding: re-organize frame configuration code
Stefano Sabatini [Tue, 21 Aug 2012 18:51:17 +0000 (20:51 +0200)]
examples/decoding_encoding: re-organize frame configuration code

Put the relevant code in one chunk, also check for frame allocation
failures.

7 years agodoc/filters: fix level for the flite Examples subsection
Stefano Sabatini [Tue, 21 Aug 2012 23:21:20 +0000 (01:21 +0200)]
doc/filters: fix level for the flite Examples subsection

7 years agobuild: x86: Only compile mpegvideo optimizations when necessary
Diego Biurrun [Mon, 13 Aug 2012 11:02:38 +0000 (13:02 +0200)]
build: x86: Only compile mpegvideo optimizations when necessary

7 years agodoc/faq: mention doc/examples
Stefano Sabatini [Tue, 21 Aug 2012 18:07:06 +0000 (20:07 +0200)]
doc/faq: mention doc/examples

Also provide a link to the github FFmpeg page containing the examples.

7 years agoexamples/muxing: cast sws_scale() argument to the expected one
Stefano Sabatini [Tue, 21 Aug 2012 16:15:32 +0000 (18:15 +0200)]
examples/muxing: cast sws_scale() argument to the expected one

Fix warnings:
muxing.c: In function ‘write_video_frame’:
muxing.c:326:23: warning: passing argument 2 of ‘sws_scale’ from incompatible pointer type [enabled by default]

7 years agodoc/eval: add missing documentation of functions
Stefano Sabatini [Tue, 21 Aug 2012 11:16:13 +0000 (13:16 +0200)]
doc/eval: add missing documentation of functions

7 years agodoc/filters: itemize examples for pad filter, and fix a few typos
Stefano Sabatini [Tue, 21 Aug 2012 10:34:10 +0000 (12:34 +0200)]
doc/filters: itemize examples for pad filter, and fix a few typos

7 years agoconfigure: Drop fastdiv option
Diego Biurrun [Mon, 20 Aug 2012 22:36:16 +0000 (00:36 +0200)]
configure: Drop fastdiv option

There is no point in having the user disable any fastdiv macros.
Besides the condition implementation was broken and only disabled
the C implementation, but no platform specific assembly versions.

7 years agobuild: Make the E-AC-3 encoder select the AC-3 encoder
Diego Biurrun [Sun, 19 Aug 2012 21:19:38 +0000 (23:19 +0200)]
build: Make the E-AC-3 encoder select the AC-3 encoder

The E-AC-3 encoder depends on almost all of the code of the AC-3
encoder, so it makes no sense to enable one without the other.