falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

avconv: add support for audio filters. 

The FATE changes are all off-by-one due to different rounding being used
(lrintf vs av_rescale_q).
tags/n0.11
Anton Khirnov 13 years ago
parent
9f26421b0b
commit
369cb092ec
5 changed files with 359 additions and 504 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +328
    -478
      avconv.c
  2. +5
    -0
      doc/avconv.texi
  3. +10
    -10
      tests/ref/fate/adpcm-ima-amv
  4. +8
    -8
      tests/ref/fate/adpcm-ima-smjpeg
  5. +8
    -8
      tests/ref/fate/smjpeg

+ 328
- 478
avconv.c
File diff suppressed because it is too large
View File


+ 5
- 0
doc/avconv.texi View File

@@ -435,6 +435,11 @@ Set the audio codec. This is an alias for @code{-codec:a}.
@item -sample_fmt[:@var{stream_specifier}] @var{sample_fmt} (@emph{output,per-stream})
Set the audio sample format. Use @code{-sample_fmts} to get a list
of supported sample formats.
@item -af @var{filter_graph} (@emph{output})
@var{filter_graph} is a description of the filter graph to apply to
the input audio.
Use the option "-filters" to show all the available filters (including
also sources and sinks). This is an alias for @code{-filter:a}.
@end table

@section Advanced Audio options:


+ 10
- 10
tests/ref/fate/adpcm-ima-amv View File

@@ -3,7 +3,7 @@
0, 1378, 1378, 1378, 2756, 0x8462443f
0, 2756, 2756, 1378, 2756, 0x9f493ba6
0, 4134, 4134, 1378, 2756, 0x634e5f06
0, 5512, 5512, 1380, 2760, 0x51f35cd4
0, 5513, 5513, 1380, 2760, 0x51f35cd4
0, 6891, 6891, 1378, 2756, 0x011c51e5
0, 8269, 8269, 1378, 2756, 0x8c2c198c
0, 9647, 9647, 1378, 2756, 0x2b4a3397
@@ -19,7 +19,7 @@
0, 23428, 23428, 1378, 2756, 0x96346ba6
0, 24806, 24806, 1378, 2756, 0x3d54543b
0, 26184, 26184, 1380, 2760, 0x601786e1
0, 27562, 27562, 1378, 2756, 0xf22a5793
0, 27563, 27563, 1378, 2756, 0xf22a5793
0, 28941, 28941, 1378, 2756, 0x21f54d49
0, 30319, 30319, 1378, 2756, 0x0c6d4399
0, 31697, 31697, 1378, 2756, 0x17282f8e
@@ -35,7 +35,7 @@
0, 45478, 45478, 1380, 2760, 0x98a76091
0, 46856, 46856, 1378, 2756, 0x5d357141
0, 48234, 48234, 1378, 2756, 0x65ea2657
0, 49612, 49612, 1378, 2756, 0xb5e1334a
0, 49613, 49613, 1378, 2756, 0xb5e1334a
0, 50991, 50991, 1378, 2756, 0x32cd5d91
0, 52369, 52369, 1378, 2756, 0xdc23722b
0, 53747, 53747, 1378, 2756, 0x2ba34684
@@ -51,7 +51,7 @@
0, 67528, 67528, 1378, 2756, 0x39c2586c
0, 68906, 68906, 1378, 2756, 0x7ffc46e5
0, 70284, 70284, 1378, 2756, 0xa2766664
0, 71662, 71662, 1378, 2756, 0xacb50c6c
0, 71663, 71663, 1378, 2756, 0xacb50c6c
0, 73041, 73041, 1378, 2756, 0x7f659084
0, 74419, 74419, 1378, 2756, 0xc72e6a12
0, 75797, 75797, 1380, 2760, 0xdb6944df
@@ -67,7 +67,7 @@
0, 89578, 89578, 1378, 2756, 0x5c17abef
0, 90956, 90956, 1378, 2756, 0xb3235184
0, 92334, 92334, 1378, 2756, 0xdabb64a6
0, 93712, 93712, 1378, 2756, 0xa95dc58d
0, 93713, 93713, 1378, 2756, 0xa95dc58d
0, 95091, 95091, 1380, 2760, 0x8e7ac9eb
0, 96469, 96469, 1378, 2756, 0x492b658e
0, 97847, 97847, 1378, 2756, 0x377483ab
@@ -83,7 +83,7 @@
0, 111628, 111628, 1378, 2756, 0xf0de66ae
0, 113006, 113006, 1378, 2756, 0xeabf3c32
0, 114384, 114384, 1378, 2756, 0xe98e81d1
0, 115762, 115762, 1380, 2760, 0x56aa5889
0, 115763, 115763, 1380, 2760, 0x56aa5889
0, 117141, 117141, 1378, 2756, 0x4fd34c0e
0, 118519, 118519, 1378, 2756, 0x67cf6912
0, 119897, 119897, 1378, 2756, 0xfa944def
@@ -99,7 +99,7 @@
0, 133678, 133678, 1378, 2756, 0x2e0e3f2e
0, 135056, 135056, 1380, 2760, 0xdf534478
0, 136434, 136434, 1378, 2756, 0xca000a2e
0, 137812, 137812, 1378, 2756, 0x87472df3
0, 137813, 137813, 1378, 2756, 0x87472df3
0, 139191, 139191, 1378, 2756, 0x16733810
0, 140569, 140569, 1378, 2756, 0xfa0734b4
0, 141947, 141947, 1378, 2756, 0x5eff3fc4
@@ -115,7 +115,7 @@
0, 155728, 155728, 1380, 2760, 0x8eca4bdb
0, 157106, 157106, 1378, 2756, 0x62bd4162
0, 158484, 158484, 1378, 2756, 0x9f744aa4
0, 159862, 159862, 1378, 2756, 0x0f3f6409
0, 159863, 159863, 1378, 2756, 0x0f3f6409
0, 161241, 161241, 1378, 2756, 0x3fee827a
0, 162619, 162619, 1378, 2756, 0x48a0ac19
0, 163997, 163997, 1378, 2756, 0x8e4ce0d0
@@ -131,7 +131,7 @@
0, 177778, 177778, 1378, 2756, 0xab01fb12
0, 179156, 179156, 1378, 2756, 0x04cffe5c
0, 180534, 180534, 1378, 2756, 0xef661c5e
0, 181912, 181912, 1378, 2756, 0x094c5fc5
0, 181913, 181913, 1378, 2756, 0x094c5fc5
0, 183291, 183291, 1378, 2756, 0xe0c1486a
0, 184669, 184669, 1380, 2760, 0x8c3535b7
0, 186047, 186047, 1378, 2756, 0x594934aa
@@ -147,7 +147,7 @@
0, 199828, 199828, 1378, 2756, 0x448e681d
0, 201206, 201206, 1378, 2756, 0x0ba9826e
0, 202584, 202584, 1378, 2756, 0x049f36fa
0, 203962, 203962, 1378, 2756, 0x096a2b62
0, 203963, 203963, 1378, 2756, 0x096a2b62
0, 205341, 205341, 1380, 2760, 0x579e2035
0, 206719, 206719, 1378, 2756, 0xd13e30e1
0, 208097, 208097, 1378, 2756, 0x30b6412b


+ 8
- 8
tests/ref/fate/adpcm-ima-smjpeg View File

@@ -27,7 +27,7 @@
0, 12789, 12789, 512, 1024, 0x3866b03b
0, 13296, 13296, 512, 1024, 0xbc005403
0, 13803, 13803, 512, 1024, 0xe9dfcc51
0, 14332, 14332, 512, 1024, 0x83c837cb
0, 14333, 14333, 512, 1024, 0x83c837cb
0, 14840, 14840, 512, 1024, 0xfa649580
0, 15347, 15347, 512, 1024, 0x519452ea
0, 15854, 15854, 512, 1024, 0xd4978774
@@ -108,7 +108,7 @@
0, 54265, 54265, 512, 1024, 0xd6ece2a1
0, 54772, 54772, 512, 1024, 0x33ab9553
0, 55279, 55279, 512, 1024, 0xd50c73a6
0, 55786, 55786, 512, 1024, 0xfe25b63a
0, 55787, 55787, 512, 1024, 0xfe25b63a
0, 56316, 56316, 512, 1024, 0x7e2959e3
0, 56823, 56823, 512, 1024, 0xa4c07b34
0, 57330, 57330, 512, 1024, 0xd6d8f15c
@@ -139,7 +139,7 @@
0, 70141, 70141, 512, 1024, 0xc434d238
0, 70648, 70648, 512, 1024, 0xe9ad7562
0, 71155, 71155, 512, 1024, 0xb51b6b50
0, 71662, 71662, 512, 1024, 0xe70aecd3
0, 71663, 71663, 512, 1024, 0xe70aecd3
0, 72192, 72192, 512, 1024, 0x03c816b2
0, 72699, 72699, 512, 1024, 0x869fdf25
0, 73206, 73206, 512, 1024, 0xd40a0a62
@@ -170,7 +170,7 @@
0, 85995, 85995, 512, 1024, 0xaa919ccc
0, 86524, 86524, 512, 1024, 0x15993dbc
0, 87031, 87031, 512, 1024, 0xbe01a7b9
0, 87538, 87538, 512, 1024, 0xefe93c09
0, 87539, 87539, 512, 1024, 0xefe93c09
0, 88046, 88046, 512, 1024, 0x1bb566e5
0, 88575, 88575, 512, 1024, 0x15ce6237
0, 89082, 89082, 512, 1024, 0xa8552e66
@@ -201,7 +201,7 @@
0, 101871, 101871, 512, 1024, 0x1e01fb02
0, 102378, 102378, 512, 1024, 0x4ed2c1d8
0, 102907, 102907, 512, 1024, 0xf2fdbe63
0, 103414, 103414, 512, 1024, 0x8d6f63a1
0, 103415, 103415, 512, 1024, 0x8d6f63a1
0, 103922, 103922, 512, 1024, 0xded468d9
0, 104429, 104429, 512, 1024, 0xccad839e
0, 104958, 104958, 512, 1024, 0xdde7c082
@@ -232,7 +232,7 @@
0, 117747, 117747, 512, 1024, 0xb01e2365
0, 118254, 118254, 512, 1024, 0x14e200d3
0, 118783, 118783, 512, 1024, 0xd1184c98
0, 119290, 119290, 512, 1024, 0xef9140e9
0, 119291, 119291, 512, 1024, 0xef9140e9
0, 119798, 119798, 512, 1024, 0x4cbb645e
0, 120305, 120305, 512, 1024, 0xe7fe2f06
0, 120812, 120812, 512, 1024, 0xf8c45028
@@ -263,7 +263,7 @@
0, 133623, 133623, 512, 1024, 0xa5099687
0, 134130, 134130, 512, 1024, 0xbff10707
0, 134637, 134637, 512, 1024, 0x37c4ffc0
0, 135166, 135166, 512, 1024, 0xf9fb6caa
0, 135167, 135167, 512, 1024, 0xf9fb6caa
0, 135674, 135674, 512, 1024, 0x3b6a3a1f
0, 136181, 136181, 512, 1024, 0x83431edb
0, 136688, 136688, 512, 1024, 0x1eb713cf
@@ -344,7 +344,7 @@
0, 175099, 175099, 512, 1024, 0xd009a7ca
0, 175606, 175606, 512, 1024, 0xb6d5a938
0, 176113, 176113, 512, 1024, 0xf3d45e47
0, 176620, 176620, 512, 1024, 0xea8e04fc
0, 176621, 176621, 512, 1024, 0xea8e04fc
0, 177150, 177150, 512, 1024, 0x0b928bd8
0, 177657, 177657, 512, 1024, 0x0f02caec
0, 178164, 178164, 512, 1024, 0xe2b137a8


+ 8
- 8
tests/ref/fate/smjpeg View File

@@ -34,7 +34,7 @@
1, 12789, 12789, 512, 1024, 0x3866b03b
1, 13296, 13296, 512, 1024, 0xbc005403
1, 13803, 13803, 512, 1024, 0xe9dfcc51
1, 14332, 14332, 512, 1024, 0x83c837cb
1, 14333, 14333, 512, 1024, 0x83c837cb
0, 666, 666, 0, 6808, 0x1f6eb7c3
1, 14840, 14840, 512, 1024, 0xfa649580
1, 15347, 15347, 512, 1024, 0x519452ea
@@ -132,7 +132,7 @@
1, 54265, 54265, 512, 1024, 0xd6ece2a1
1, 54772, 54772, 512, 1024, 0x33ab9553
1, 55279, 55279, 512, 1024, 0xd50c73a6
1, 55786, 55786, 512, 1024, 0xfe25b63a
1, 55787, 55787, 512, 1024, 0xfe25b63a
1, 56316, 56316, 512, 1024, 0x7e2959e3
0, 2555, 2555, 0, 7213, 0x97b89994
1, 56823, 56823, 512, 1024, 0xa4c07b34
@@ -170,7 +170,7 @@
1, 70648, 70648, 512, 1024, 0xe9ad7562
0, 3222, 3222, 0, 7065, 0x45035c5c
1, 71155, 71155, 512, 1024, 0xb51b6b50
1, 71662, 71662, 512, 1024, 0xe70aecd3
1, 71663, 71663, 512, 1024, 0xe70aecd3
1, 72192, 72192, 512, 1024, 0x03c816b2
1, 72699, 72699, 512, 1024, 0x869fdf25
1, 73206, 73206, 512, 1024, 0xd40a0a62
@@ -207,7 +207,7 @@
1, 85995, 85995, 512, 1024, 0xaa919ccc
1, 86524, 86524, 512, 1024, 0x15993dbc
1, 87031, 87031, 512, 1024, 0xbe01a7b9
1, 87538, 87538, 512, 1024, 0xefe93c09
1, 87539, 87539, 512, 1024, 0xefe93c09
1, 88046, 88046, 512, 1024, 0x1bb566e5
0, 4000, 4000, 0, 7246, 0x519a7a3c
1, 88575, 88575, 512, 1024, 0x15ce6237
@@ -245,7 +245,7 @@
1, 102378, 102378, 512, 1024, 0x4ed2c1d8
0, 4666, 4666, 111, 7104, 0xc0d14f78
1, 102907, 102907, 512, 1024, 0xf2fdbe63
1, 103414, 103414, 512, 1024, 0x8d6f63a1
1, 103415, 103415, 512, 1024, 0x8d6f63a1
1, 103922, 103922, 512, 1024, 0xded468d9
1, 104429, 104429, 512, 1024, 0xccad839e
1, 104958, 104958, 512, 1024, 0xdde7c082
@@ -282,7 +282,7 @@
1, 117747, 117747, 512, 1024, 0xb01e2365
1, 118254, 118254, 512, 1024, 0x14e200d3
1, 118783, 118783, 512, 1024, 0xd1184c98
1, 119290, 119290, 512, 1024, 0xef9140e9
1, 119291, 119291, 512, 1024, 0xef9140e9
1, 119798, 119798, 512, 1024, 0x4cbb645e
0, 5444, 5444, 111, 7106, 0xd1a83ddc
1, 120305, 120305, 512, 1024, 0xe7fe2f06
@@ -320,7 +320,7 @@
1, 134130, 134130, 512, 1024, 0xbff10707
1, 134637, 134637, 512, 1024, 0x37c4ffc0
0, 6111, 6111, 111, 7283, 0x19dd7319
1, 135166, 135166, 512, 1024, 0xf9fb6caa
1, 135167, 135167, 512, 1024, 0xf9fb6caa
1, 135674, 135674, 512, 1024, 0x3b6a3a1f
1, 136181, 136181, 512, 1024, 0x83431edb
1, 136688, 136688, 512, 1024, 0x1eb713cf
@@ -418,7 +418,7 @@
1, 175606, 175606, 512, 1024, 0xb6d5a938
1, 176113, 176113, 512, 1024, 0xf3d45e47
0, 8000, 8000, 111, 2153, 0xf4e3bc17
1, 176620, 176620, 512, 1024, 0xea8e04fc
1, 176621, 176621, 512, 1024, 0xea8e04fc
1, 177150, 177150, 512, 1024, 0x0b928bd8
1, 177657, 177657, 512, 1024, 0x0f02caec
1, 178164, 178164, 512, 1024, 0xe2b137a8


Write Preview
Loading…
Cancel
Save