Commit a1b91b0c authored by Rostislav Pehlivanov's avatar Rostislav Pehlivanov

lavc: prefer the mp3float decoder to the mp3 decoder

On modern x86 systems its around 2x faster. For systems without
FPUs it'll be slower, but our policy is to prefer floating point
implementations and to let users decide what's best (or just not
compile them on systems without FPUs).
Signed-off-by: 's avatarRostislav Pehlivanov <atomnuker@gmail.com>
parent e760c12a
...@@ -432,12 +432,12 @@ extern AVCodec ff_mp2_encoder; ...@@ -432,12 +432,12 @@ extern AVCodec ff_mp2_encoder;
extern AVCodec ff_mp2_decoder; extern AVCodec ff_mp2_decoder;
extern AVCodec ff_mp2float_decoder; extern AVCodec ff_mp2float_decoder;
extern AVCodec ff_mp2fixed_encoder; extern AVCodec ff_mp2fixed_encoder;
extern AVCodec ff_mp3_decoder;
extern AVCodec ff_mp3float_decoder; extern AVCodec ff_mp3float_decoder;
extern AVCodec ff_mp3adu_decoder; extern AVCodec ff_mp3_decoder;
extern AVCodec ff_mp3adufloat_decoder; extern AVCodec ff_mp3adufloat_decoder;
extern AVCodec ff_mp3on4_decoder; extern AVCodec ff_mp3adu_decoder;
extern AVCodec ff_mp3on4float_decoder; extern AVCodec ff_mp3on4float_decoder;
extern AVCodec ff_mp3on4_decoder;
extern AVCodec ff_mpc7_decoder; extern AVCodec ff_mpc7_decoder;
extern AVCodec ff_mpc8_decoder; extern AVCodec ff_mpc8_decoder;
extern AVCodec ff_nellymoser_encoder; extern AVCodec ff_nellymoser_encoder;
......
FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-gapless-mp3 FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-gapless-mp3
fate-gapless-mp3: CMD = gapless $(TARGET_SAMPLES)/gapless/gapless.mp3 fate-gapless-mp3: CMD = gapless $(TARGET_SAMPLES)/gapless/gapless.mp3 "-c:a mp3"
FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-audiomatch-square-mp3 FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-audiomatch-square-mp3
fate-audiomatch-square-mp3: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/square3.mp3 $(TARGET_SAMPLES)/audiomatch/square3.wav fate-audiomatch-square-mp3: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/square3.mp3 $(TARGET_SAMPLES)/audiomatch/square3.wav
......
...@@ -50,7 +50,7 @@ pkt_duration=15040 ...@@ -50,7 +50,7 @@ pkt_duration=15040
pkt_duration_time=0.001066 pkt_duration_time=0.001066
pkt_pos=16292 pkt_pos=16292
pkt_size=417 pkt_size=417
sample_fmt=s16p sample_fmt=fltp
nb_samples=47 nb_samples=47
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -69,7 +69,7 @@ pkt_duration=368640 ...@@ -69,7 +69,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=16709 pkt_pos=16709
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -88,7 +88,7 @@ pkt_duration=368640 ...@@ -88,7 +88,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=17127 pkt_pos=17127
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -107,7 +107,7 @@ pkt_duration=368640 ...@@ -107,7 +107,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=17545 pkt_pos=17545
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -126,7 +126,7 @@ pkt_duration=368640 ...@@ -126,7 +126,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=17963 pkt_pos=17963
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -145,7 +145,7 @@ pkt_duration=368640 ...@@ -145,7 +145,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=18381 pkt_pos=18381
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -164,7 +164,7 @@ pkt_duration=368640 ...@@ -164,7 +164,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=18799 pkt_pos=18799
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -183,7 +183,7 @@ pkt_duration=368640 ...@@ -183,7 +183,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=19217 pkt_pos=19217
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -202,7 +202,7 @@ pkt_duration=368640 ...@@ -202,7 +202,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=19635 pkt_pos=19635
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -221,7 +221,7 @@ pkt_duration=368640 ...@@ -221,7 +221,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=20053 pkt_pos=20053
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -240,7 +240,7 @@ pkt_duration=368640 ...@@ -240,7 +240,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=20471 pkt_pos=20471
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -259,7 +259,7 @@ pkt_duration=368640 ...@@ -259,7 +259,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=20889 pkt_pos=20889
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -278,7 +278,7 @@ pkt_duration=368640 ...@@ -278,7 +278,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=21307 pkt_pos=21307
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -297,7 +297,7 @@ pkt_duration=368640 ...@@ -297,7 +297,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=21725 pkt_pos=21725
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -316,7 +316,7 @@ pkt_duration=368640 ...@@ -316,7 +316,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=22143 pkt_pos=22143
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -335,7 +335,7 @@ pkt_duration=368640 ...@@ -335,7 +335,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=22561 pkt_pos=22561
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -354,7 +354,7 @@ pkt_duration=368640 ...@@ -354,7 +354,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=22979 pkt_pos=22979
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -373,7 +373,7 @@ pkt_duration=368640 ...@@ -373,7 +373,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=23397 pkt_pos=23397
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -392,7 +392,7 @@ pkt_duration=368640 ...@@ -392,7 +392,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=23815 pkt_pos=23815
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -411,7 +411,7 @@ pkt_duration=368640 ...@@ -411,7 +411,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=24233 pkt_pos=24233
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
...@@ -430,7 +430,7 @@ pkt_duration=368640 ...@@ -430,7 +430,7 @@ pkt_duration=368640
pkt_duration_time=0.026122 pkt_duration_time=0.026122
pkt_pos=24651 pkt_pos=24651
pkt_size=418 pkt_size=418
sample_fmt=s16p sample_fmt=fltp
nb_samples=1152 nb_samples=1152
channels=2 channels=2
channel_layout=stereo channel_layout=stereo
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment