Michael Niedermayer
3f41e57fa8
Merge commit '220494ad0b2e9e980ef703b46b69308236f29be5'
...
* commit '220494ad0b2e9e980ef703b46b69308236f29be5':
dcadec: treat all 2-channel modes as Stereo in dca_downmix.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-29 04:21:34 +01:00
Michael Niedermayer
97468463a2
Merge commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48'
...
* commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48':
dca: support mixing LFE in dca_downmix.
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-29 04:00:59 +01:00
Michael Niedermayer
7ea9c4a94c
Merge commit '149438cfe5d233c46bb18341b7c574fe643dd5f2'
...
* commit '149438cfe5d233c46bb18341b7c574fe643dd5f2':
dca: improve default stereo downmix coefficients.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-29 03:48:29 +01:00
Michael Niedermayer
12235a3ed2
avcodec/dcadec: print more details about errors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-29 03:42:03 +01:00
Michael Niedermayer
43ec456320
Merge commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1'
...
* commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1':
dca: extract core substream's embedded downmix coeffcient codes, if present.
Conflicts:
libavcodec/dcadata.h
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-29 03:28:15 +01:00
Michael Niedermayer
c122e697fa
Merge commit '27245b4e1bbb7a863341db321b5bdc5792e427d9'
...
* commit '27245b4e1bbb7a863341db321b5bdc5792e427d9':
dca: remove embedded downmix coefficient extraction.
Conflicts:
libavcodec/dcadata.h
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-29 01:12:02 +01:00
Michael Niedermayer
a7f8817720
Merge commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d'
...
* commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d':
dca: convert dca_default_coeffs to float.
Conflicts:
libavcodec/dcadata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-29 00:32:14 +01:00
Michael Niedermayer
e9a47896a0
Merge commit '25609b63d2e07d26d610f485a22082d32c96c0f5'
...
* commit '25609b63d2e07d26d610f485a22082d32c96c0f5':
dcadec: store the stereo downmix coefficients as float in the DCAContext.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-29 00:24:41 +01:00
Michael Niedermayer
cb751a6a96
Merge commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e'
...
* commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e':
dcadec: implement request_channel_layout.
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-29 00:18:42 +01:00
Stefano Sabatini
d1daa71f9d
doc/ffserver: mention remaining stream options
2013-11-29 00:04:17 +01:00
Stefano Sabatini
f652f70e32
doc/ffserver: move general stream options upwards in the list
2013-11-29 00:04:17 +01:00
Stefano Sabatini
a42c20f089
doc/ffserver: reorder/extend stream video encoding options
2013-11-29 00:04:17 +01:00
Stefano Sabatini
b9a3ac89c8
doc/ffserver: fix bitrate unit for bitrate option
2013-11-29 00:04:17 +01:00
Stefano Sabatini
ab89d2dd2a
ffserver: fix typo in comment: defaut -> default
2013-11-28 23:13:46 +01:00
Stefano Sabatini
6aea3d597e
doc/ffserver: add notice about re-launch behavior
2013-11-28 23:13:46 +01:00
Stefano Sabatini
2a0349786a
doc/ffserver: document InputFormat stream option
2013-11-28 23:13:45 +01:00
Stefano Sabatini
77f5cb92af
ffserver: factorize code setting ReadOnlyFile/File options
2013-11-28 23:13:45 +01:00
Stefano Sabatini
0e1e5d0053
ffserver: improve error feedback in open_input_stream()
2013-11-28 23:13:45 +01:00
Stefano Sabatini
ddab41995f
ffserver: drop stream AudioQuality option
...
It has no effect, and it was never documented.
2013-11-28 23:13:45 +01:00
Stefano Sabatini
4f60d53b18
ffserver: add comment about how Launch path program is created
2013-11-28 23:13:45 +01:00
Stefano Sabatini
7cbbc4f7e7
ffserver: extend error handling when parsing the configuration file
...
In particular, abort immediately in case of memory error, avoid potential
crashes.
2013-11-28 23:13:45 +01:00
Stefano Sabatini
04702a0d3d
ffserver: add some error handling to main()
2013-11-28 23:13:45 +01:00
Michael Niedermayer
3adb825650
Merge commit 'cf7860db608df7c76471d8b61f07abbd5aad8dd5'
...
* commit 'cf7860db608df7c76471d8b61f07abbd5aad8dd5':
x86: dsputil: Suppress deprecation warnings for XvMC bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-28 22:47:37 +01:00
Michael Niedermayer
f21ca39e81
Merge commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b'
...
* commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b':
dsputil/pngdsp: fix signed/unsigned type in end comparison
Conflicts:
libavcodec/dsputil.c
See: 454a11a1c9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-28 22:02:55 +01:00
Tim Walker
3c8507a845
dcadec: add disable_xch private option.
...
This supplements the deprecated request_channels-based control of XCh decoding.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-28 22:02:53 +01:00
Tim Walker
220494ad0b
dcadec: treat all 2-channel modes as Stereo in dca_downmix.
...
The check for (prim_channels > 2) before calling dca_downmix made these
cases unreachable, but now 2.1 layouts will go through the downmix code.
Having dual mono, Lt/Rt and sum-difference layouts print errors when
regular Stereo doesn't seems pointless.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-28 22:02:53 +01:00
Tim Walker
aaa44d0299
dca: support mixing LFE in dca_downmix.
...
Embedded downmix coefficients can use this.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-28 22:02:53 +01:00
Tim Walker
149438cfe5
dca: improve default stereo downmix coefficients.
...
Previous coefficients were producing a non-normalized, incorrect Lt/Rt downmix.
The new coefficients produce a standard Lo/Ro downmix with 3dB attenuation.
This should match the typical default coefficients used by DTS encoders.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-28 22:02:53 +01:00
Tim Walker
44b17d794a
dca: extract core substream's embedded downmix coeffcient codes, if present.
...
As per ETSI TS 102 114 V1.4.1 specification.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-28 22:02:53 +01:00
Tim Walker
27245b4e1b
dca: remove embedded downmix coefficient extraction.
...
It was based on an old, seemingly incorrect specification, so default
coefficients were always used anyway.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-28 22:02:50 +01:00
Michael Niedermayer
e975c147e1
library.mak: only run asm strip if ASMSTRIP flags are set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-28 21:52:46 +01:00
Tim Walker
b6d5e6aa10
dca: convert dca_default_coeffs to float.
...
Easier to read, modify, and avoids relying on an outdated table.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-28 21:38:22 +01:00
Tim Walker
25609b63d2
dcadec: store the stereo downmix coefficients as float in the DCAContext.
...
The 7-bit codes previously used are absent from the ETSI 102 114 V1.4.1 spec.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-28 21:35:22 +01:00
Michael Niedermayer
191454f26e
configure: remove code that disables striping in the absence of some flags
...
This prevents breaking (non asm) striping in that case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-28 21:35:12 +01:00
Marton Balint
31bb172be2
ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero duration
...
When fix_sub_duration is used, and the duration fixing code is generating 0
duration, that is definitely zero, and not undefined or infinite (which may be
the case for decoded AVSubtitles depending on the codec), so it is safe to drop
it.
It fixes teletext subtitle sources, when the subtitles are transmitted twice
after each other for some reason.
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Nicolas George <george@nsup.org>
2013-11-28 21:30:03 +01:00
Marton Balint
4d6f2ff524
ffmpeg: free empty subtitles as well in transcode_subtitles
...
Even if it does not matter at the moment, because subtitles with num_rect == 0
have no memory allocated, this is how we expect the users to use the API, a
returned AVSubtitle should be freed with avsubtitle_free.
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Nicolas George <george@nsup.org>
2013-11-28 21:30:03 +01:00
Marton Balint
3e396ca8ed
ffmpeg: do not pass possibly undefined subtitles to sub2video_update
...
It should not matter for real-life usage, it is just cleaner this way.
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Nicolas George <george@nsup.org>
2013-11-28 21:29:54 +01:00
Michael Niedermayer
e283c26c35
build sys: rename STRIPFLAGS to ASMSTRIPFLAGS
...
This more closely matches the actual use, also we use plain
strip without these flags for striping
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-28 21:29:13 +01:00
Michael Niedermayer
71b95f2ab6
Merge commit '0673ede985a6560e7efb86dab1c58fb7f95ce587'
...
* commit '0673ede985a6560e7efb86dab1c58fb7f95ce587':
configure: add strip flags checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-28 21:27:17 +01:00
Tim Walker
89de5157b1
dcadec: implement request_channel_layout.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-28 21:10:29 +01:00
Stefano Sabatini
58010e57b2
doc/ffserver: fix documentation for CustomLog
2013-11-28 20:17:15 +01:00
Stefano Sabatini
805b607484
doc/ffserver: extend documentation for VideoBitRateRange
2013-11-28 20:17:10 +01:00
Stefano Sabatini
bcbf8920ed
doc/ffserver: clarify/extend documentation about status streams
2013-11-28 20:17:00 +01:00
Stefano Sabatini
312d075e5d
doc/ffserver: move ACL syntax section before the global option sections
2013-11-28 20:16:53 +01:00
Stefano Sabatini
4e39962f0c
doc/ffserver: document "Launch" feed option
2013-11-28 20:16:46 +01:00
Stefano Sabatini
07315da149
doc/ffserver: fix documentation for -n option
...
Launch option is defined in the Feed section.
2013-11-28 18:59:29 +01:00
Stefano Sabatini
1ee9341a70
doc/ffserver: extend documentation for CustomLog option
2013-11-28 18:59:21 +01:00
Stefano Sabatini
2121945770
doc/ffserver: fix RTPS -> RTSP ttypo
...
Spotted-by: lazy ubitux
2013-11-28 17:28:27 +01:00
Stefano Sabatini
b89983c4ea
doc/ffserver: clearly specify whence ffserver reads the configuration file
2013-11-28 17:28:22 +01:00
Stefano Sabatini
bb097d037c
doc/ffserver: add notice about case-insensitiveness
2013-11-28 17:13:40 +01:00