[FFmpeg-cvslog] avfilter/af_compand: fix clipping with default options
ffmpeg | branch: master | Paul B Mahol one...@gmail.com | Fri Jul 17 11:23:45
2015 +| [297df52f303529fd3c326bc8f398a5b3cbf71c0b] | committer: Paul B Mahol
avfilter/af_compand: fix clipping with default options
Decays and attacks where by default set only for first channel
which caused poor defaults to be used which produced clipping
on any higher channel.
Reported-by: lachs0r
Signed-off-by: Paul B Mahol one...@gmail.com
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=297df52f303529fd3c326bc8f398a5b3cbf71c0b
---
doc/filters.texi |2 ++
libavfilter/af_compand.c |5 +
2 files changed, 7 insertions(+)
diff --git a/doc/filters.texi b/doc/filters.texi
index 518aef8..1bef836 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1462,6 +1462,8 @@ situations, the attack time (response to the audio
getting louder) should be
shorter than the decay time, because the human ear is more sensitive to sudden
loud audio than sudden soft audio. A typical value for attack is 0.3 seconds
and
a typical value for decay is 0.8 seconds.
+If specified number of attacks decays is lower than number of channels, the
last
+set attack/decay will be used for all remaining channels.
@item points
A list of points for the transfer function, specified in dB relative to the
diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c
index 55ad98a..610787f 100644
--- a/libavfilter/af_compand.c
+++ b/libavfilter/af_compand.c
@@ -398,6 +398,11 @@ static int config_output(AVFilterLink *outlink)
return AVERROR(EINVAL);
}
+for (i = nb_decays; i channels; i++) {
+s-channels[i].attack = s-channels[nb_decays - 1].attack;
+s-channels[i].decay = s-channels[nb_decays - 1].decay;
+}
+
#define S(x) s-segments[2 * ((x) + 1)]
p = s-points;
for (i = 0, new_nb_items = 0; i nb_points; i++) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter: bump minor and add Changelog entry
ffmpeg | branch: master | Paul B Mahol one...@gmail.com | Fri Jul 17 11:39:52 2015 +| [ec6bef68f14f08e1295ea9c65fcb8b3f2e53193e] | committer: Paul B Mahol avfilter: bump minor and add Changelog entry Signed-off-by: Paul B Mahol one...@gmail.com http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec6bef68f14f08e1295ea9c65fcb8b3f2e53193e --- Changelog |1 + libavfilter/version.h |4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index b3a3e11..5bf8c8a 100644 --- a/Changelog +++ b/Changelog @@ -17,6 +17,7 @@ version next: - Intel QSV-accelerated MPEG-2 video and HEVC encoding - libkvazaar HEVC encoder - erosion, dilation, deflate and inflate video filters +- Dynamic Audio Normalizer as dynaudnorm filter version 2.7: diff --git a/libavfilter/version.h b/libavfilter/version.h index dead46e..d22b2c5 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,8 +30,8 @@ #include libavutil/version.h #define LIBAVFILTER_VERSION_MAJOR 5 -#define LIBAVFILTER_VERSION_MINOR 22 -#define LIBAVFILTER_VERSION_MICRO 101 +#define LIBAVFILTER_VERSION_MINOR 23 +#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri Jul 17 14:40:19 2015 +0200| [694f9ab1ef141cf80de8f81db6955a17606182af] | committer: Michael Niedermayer Merge commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1' * commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1': Revert mov: Double-check that alias path is not an absolute path Conflicts: libavformat/mov.c See: c9c7263e5820c957598643216c42be9b1c4f2d2b Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=694f9ab1ef141cf80de8f81db6955a17606182af --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Revert mov: Double-check that alias path is not an absolute path
ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Fri
Jul 10 18:46:19 2015 +0100| [f1840b070dd449ad25e1ebbab463f10863a5e0f1] |
committer: Vittorio Giovara
Revert mov: Double-check that alias path is not an absolute path
This reverts commit 9286de045968ad456d4e752651eec22de5e89060.
The change broke support for legit absolute file paths.
Reported-by: Maksym Veremeyenko ve...@m1stereo.tv.
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1840b070dd449ad25e1ebbab463f10863a5e0f1
---
libavformat/mov.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 66a0391..b78a1c3 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2394,7 +2394,7 @@ static int mov_open_dref(AVIOContext **pb, char *src,
MOVDref *ref,
{
/* try relative path, we do not try the absolute because it can leak
information about our
system to an attacker */
-if (ref-nlvl_to 0 ref-nlvl_from 0 ref-path[0] != '/') {
+if (ref-nlvl_to 0 ref-nlvl_from 0) {
char filename[1024];
char *src_path;
int i, l;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter: add Dynamic Audio Normalizer filter
ffmpeg | branch: master | LoRd_MuldeR muld...@gmx.de | Tue Jul 7 16:19:59
2015 +| [21436b95dc96e9cb2ae3f583f219349976ec1b7e] | committer: Paul B Mahol
avfilter: add Dynamic Audio Normalizer filter
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21436b95dc96e9cb2ae3f583f219349976ec1b7e
---
doc/filters.texi| 158 ++
libavfilter/Makefile|1 +
libavfilter/af_dynaudnorm.c | 734 +++
libavfilter/allfilters.c|1 +
4 files changed, 894 insertions(+)
diff --git a/doc/filters.texi b/doc/filters.texi
index 49fab59..518aef8 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1544,6 +1544,164 @@ Optional. It should have a value much less than 1 (e.g.
0.05 or 0.02) and is
used to prevent clipping.
@end table
+@section dynaudnorm
+Dynamic Audio Normalizer.
+
+This filter applies a certain amount of gain to the input audio in order
+to bring its peak magnitude to a target level (e.g. 0 dBFS). However, in
+contrast to more simple normalization algorithms, the Dynamic Audio
+Normalizer *dynamically* re-adjusts the gain factor to the input audio.
+This allows for applying extra gain to the quiet sections of the audio
+while avoiding distortions or clipping the loud sections. In other words:
+The Dynamic Audio Normalizer will even out the volume of quiet and loud
+sections, in the sense that the volume of each section is brought to the
+same target level. Note, however, that the Dynamic Audio Normalizer achieves
+this goal *without* applying dynamic range compressing. It will retain 100%
+of the dynamic range *within* each section of the audio file.
+
+@table @option
+@item f
+Set the frame length in milliseconds. In range from 10 to 8000 milliseconds.
+Default is 500 milliseconds.
+The Dynamic Audio Normalizer processes the input audio in small chunks,
+referred to as frames. This is required, because a peak magnitude has no
+meaning for just a single sample value. Instead, we need to determine the
+peak magnitude for a contiguous sequence of sample values. While a standard
+normalizer would simply use the peak magnitude of the complete file, the
+Dynamic Audio Normalizer determines the peak magnitude individually for each
+frame. The length of a frame is specified in milliseconds. By default, the
+Dynamic Audio Normalizer uses a frame length of 500 milliseconds, which has
+been found to give good results with most files.
+Note that the exact frame length, in number of samples, will be determined
+automatically, based on the sampling rate of the individual input audio file.
+
+@item g
+Set the Gaussian filter window size. In range from 3 to 301, must be odd
+number. Default is 31.
+Probably the most important parameter of the Dynamic Audio Normalizer is the
+@code{window size} of the Gaussian smoothing filter. The filter's window size
+is specified in frames, centered around the current frame. For the sake of
+simplicity, this must be an odd number. Consequently, the default value of 31
+takes into account the current frame, as well as the 15 preceding frames and
+the 15 subsequent frames. Using a larger window results in a stronger
+smoothing effect and thus in less gain variation, i.e. slower gain
+adaptation. Conversely, using a smaller window results in a weaker smoothing
+effect and thus in more gain variation, i.e. faster gain adaptation.
+In other words, the more you increase this value, the more the Dynamic Audio
+Normalizer will behave like a traditional normalization filter. On the
+contrary, the more you decrease this value, the more the Dynamic Audio
+Normalizer will behave like a dynamic range compressor.
+
+@item p
+Set the target peak value. This specifies the highest permissible magnitude
+level for the normalized audio input. This filter will try to approach the
+target peak magnitude as closely as possible, but at the same time it also
+makes sure that the normalized signal will never exceed the peak magnitude.
+A frame's maximum local gain factor is imposed directly by the target peak
+magnitude. The default value is 0.95 and thus leaves a headroom of 5%*.
+It is not recommended to go above this value.
+
+@item m
+Set the maximum gain factor. In range from 1.0 to 100.0. Default is 10.0.
+The Dynamic Audio Normalizer determines the maximum possible (local) gain
+factor for each input frame, i.e. the maximum gain factor that does not
+result in clipping or distortion. The maximum gain factor is determined by
+the frame's highest magnitude sample. However, the Dynamic Audio Normalizer
+additionally bounds the frame's maximum gain factor by a predetermined
+(global) maximum gain factor. This is done in order to avoid excessive gain
+factors in silent or almost silent frames. By default, the maximum gain
+factor is 10.0, For most inputs the default value should be sufficient and
+it usually is not recommended to increase this value. Though, for input
+with an extremely low overall volume level, it
[FFmpeg-cvslog] Merge commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri Jul 17 13:48:40 2015 +0200| [441d5a7084b56fd9874daede2ef90356b3bf9d16] | committer: Michael Niedermayer Merge commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37' * commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37': h264: Add support for Closed Caption export Conflicts: libavcodec/h264.c libavcodec/h264_sei.c See: 8234f0e3b485811d60c228c40a94a141c46e61ca Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=441d5a7084b56fd9874daede2ef90356b3bf9d16 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit 'a53540840d26beb57a5e53b7f488c23ddf86e193'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri Jul 17 14:48:41 2015 +0200| [187f4278e81c19c79b8a0dbad513e47a00875a57] | committer: Michael Niedermayer Merge commit 'a53540840d26beb57a5e53b7f488c23ddf86e193' * commit 'a53540840d26beb57a5e53b7f488c23ddf86e193': APIchanges: Mention lavfi and lavd identification symbol addition Conflicts: doc/APIchanges No change as these symbols have been added a very long time ago to FFmpeg and are already listed in APIchanges Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=187f4278e81c19c79b8a0dbad513e47a00875a57 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] APIchanges: Mention lavfi and lavd identification symbol addition
ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Tue Jul 14 00:11:16 2015 +0100| [a53540840d26beb57a5e53b7f488c23ddf86e193] | committer: Vittorio Giovara APIchanges: Mention lavfi and lavd identification symbol addition http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a53540840d26beb57a5e53b7f488c23ddf86e193 --- doc/APIchanges |4 1 file changed, 4 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index a2c5eb05..8d22556 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -16,6 +16,10 @@ API changes, most recent first: 2015-xx-xx - xxx - lavu 56.15.0 Add av_version_info(). +2015-xx-xx - xxx - lavfi 5.1.0 - version.h + xxx - lavd 55.2.0 - version.h + Add library identification symbols, LIBAVFILTER_IDENT and LIBAVDEVICE_IDENT. + 2015-xx-xx - xxx - lavf 56.20.0 - avio.h Add avio_put_str16be. ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '0cf5588d69922aa3e063bac6304c09c543a9ef52'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri Jul 17 14:58:45 2015 +0200| [1cdfae0b3e3e5f70ffa5ef4df880ed37fb61d452] | committer: Michael Niedermayer Merge commit '0cf5588d69922aa3e063bac6304c09c543a9ef52' * commit '0cf5588d69922aa3e063bac6304c09c543a9ef52': hq_hqa: Fix decoding when INFO section is absent Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1cdfae0b3e3e5f70ffa5ef4df880ed37fb61d452 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] hq_hqa: Fix decoding when INFO section is absent
ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Fri
Jul 10 15:52:00 2015 +0100| [0cf5588d69922aa3e063bac6304c09c543a9ef52] |
committer: Vittorio Giovara
hq_hqa: Fix decoding when INFO section is absent
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cf5588d69922aa3e063bac6304c09c543a9ef52
---
libavcodec/hq_hqa.c |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c
index ae378e6..4871c59 100644
--- a/libavcodec/hq_hqa.c
+++ b/libavcodec/hq_hqa.c
@@ -310,9 +310,11 @@ static int hq_hqa_decode_frame(AVCodecContext *avctx, void
*data,
return AVERROR_INVALIDDATA;
}
-info_tag = bytestream2_get_le32(ctx-gbc);
+info_tag = bytestream2_peek_le32(ctx-gbc);
if (info_tag == MKTAG('I', 'N', 'F', 'O')) {
-int info_size = bytestream2_get_le32(ctx-gbc);
+int info_size;
+bytestream2_skip(ctx-gbc, 4);
+info_size = bytestream2_get_le32(ctx-gbc);
if (bytestream2_get_bytes_left(ctx-gbc) info_size) {
av_log(avctx, AV_LOG_ERROR, Invalid INFO size (%d).\n,
info_size);
return AVERROR_INVALIDDATA;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/af_astats: measure minimal and mean difference between two consecutive samples
ffmpeg | branch: master | Paul B Mahol one...@gmail.com | Fri Jul 17 09:30:03
2015 +| [3b365dda5cd5e0db394d807bf904403bde4f4bc8] | committer: Paul B Mahol
avfilter/af_astats: measure minimal and mean difference between two consecutive
samples
Signed-off-by: Paul B Mahol one...@gmail.com
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b365dda5cd5e0db394d807bf904403bde4f4bc8
---
doc/filters.texi| 11 +++
libavfilter/af_astats.c | 25 +
2 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index 3b4ec2c..49fab59 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -952,7 +952,9 @@ Available keys for each channel are:
DC_offset
Min_level
Max_level
+Min_difference
Max_difference
+Mean_difference
Peak_level
RMS_peak
RMS_trough
@@ -965,7 +967,9 @@ and for Overall:
DC_offset
Min_level
Max_level
+Min_difference
Max_difference
+Mean_difference
Peak_level
RMS_level
RMS_peak
@@ -997,9 +1001,16 @@ Minimal sample level.
@item Max level
Maximal sample level.
+@item Min difference
+Minimal difference between two consecutive samples.
+
@item Max difference
Maximal difference between two consecutive samples.
+@item Mean difference
+Mean difference between two consecutive samples.
+The average of each difference between two consecutive samples.
+
@item Peak level dB
@item RMS level dB
Standard peak and RMS level measured in dBFS.
diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c
index 0e8c3e2..e38d66b 100644
--- a/libavfilter/af_astats.c
+++ b/libavfilter/af_astats.c
@@ -33,7 +33,8 @@ typedef struct ChannelStats {
double min, max;
double min_run, max_run;
double min_runs, max_runs;
-double max_diff;
+double min_diff, max_diff;
+double diff1_sum;
uint64_t mask;
uint64_t min_count, max_count;
uint64_t nb_samples;
@@ -104,7 +105,7 @@ static void reset_stats(AudioStatsContext *s)
p-min = p-min_sigma_x2 = DBL_MAX;
p-max = p-max_sigma_x2 = DBL_MIN;
-p-max_diff = -1;
+p-min_diff = p-max_diff = -1;
}
}
@@ -162,7 +163,9 @@ static inline void update_stat(AudioStatsContext *s,
ChannelStats *p, double d)
p-sigma_x += d;
p-sigma_x2 += d * d;
p-avg_sigma_x2 = p-avg_sigma_x2 * s-mult + (1.0 - s-mult) * d * d;
+p-min_diff = FFMIN(p-min_diff == -1 ? DBL_MAX : p-min_diff, FFABS(d -
(p-min_diff == -1 ? DBL_MAX : p-last)));
p-max_diff = FFMAX(p-max_diff, FFABS(d - (p-max_diff == -1 ? d :
p-last)));
+p-diff1_sum += FFABS(d - p-last);
p-last = d;
p-mask |= llrint(d * (1LLU63));
@@ -193,8 +196,9 @@ static void set_metadata(AudioStatsContext *s, AVDictionary
**metadata)
{
uint64_t mask = 0, min_count = 0, max_count = 0, nb_samples = 0;
double min_runs = 0, max_runs = 0,
- min = DBL_MAX, max = DBL_MIN, max_diff = 0,
+ min = DBL_MAX, max = DBL_MIN, min_diff = DBL_MAX, max_diff = 0,
max_sigma_x = 0,
+ diff1_sum = 0,
sigma_x = 0,
sigma_x2 = 0,
min_sigma_x2 = DBL_MAX,
@@ -209,7 +213,9 @@ static void set_metadata(AudioStatsContext *s, AVDictionary
**metadata)
min = FFMIN(min, p-min);
max = FFMAX(max, p-max);
+min_diff = FFMIN(min_diff, p-min_diff);
max_diff = FFMAX(max_diff, p-max_diff);
+diff1_sum += p-diff1_sum,
min_sigma_x2 = FFMIN(min_sigma_x2, p-min_sigma_x2);
max_sigma_x2 = FFMAX(max_sigma_x2, p-max_sigma_x2);
sigma_x += p-sigma_x;
@@ -226,7 +232,9 @@ static void set_metadata(AudioStatsContext *s, AVDictionary
**metadata)
set_meta(metadata, c + 1, DC_offset, %f, p-sigma_x /
p-nb_samples);
set_meta(metadata, c + 1, Min_level, %f, p-min);
set_meta(metadata, c + 1, Max_level, %f, p-max);
+set_meta(metadata, c + 1, Min_difference, %f, p-min_diff);
set_meta(metadata, c + 1, Max_difference, %f, p-max_diff);
+set_meta(metadata, c + 1, Mean_difference, %f, p-diff1_sum /
(p-nb_samples - 1));
set_meta(metadata, c + 1, Peak_level, %f,
LINEAR_TO_DB(FFMAX(-p-min, p-max)));
set_meta(metadata, c + 1, RMS_level, %f,
LINEAR_TO_DB(sqrt(p-sigma_x2 / p-nb_samples)));
set_meta(metadata, c + 1, RMS_peak, %f,
LINEAR_TO_DB(sqrt(p-max_sigma_x2)));
@@ -240,7 +248,9 @@ static void set_metadata(AudioStatsContext *s, AVDictionary
**metadata)
set_meta(metadata, 0, Overall.DC_offset, %f, max_sigma_x / (nb_samples
/ s-nb_channels));
set_meta(metadata, 0, Overall.Min_level, %f, min);
set_meta(metadata, 0, Overall.Max_level, %f, max);
+set_meta(metadata, 0, Overall.Min_difference, %f, min_diff);
set_meta(metadata, 0, Overall.Max_difference, %f, max_diff);
+set_meta(metadata, 0, Overall.Mean_difference, %f, diff1_sum /
(nb_samples - s-nb_channels));
set_meta(metadata, 0, Overall.Peak_level, %f, LINEAR_TO_DB(FFMAX(-min,
[FFmpeg-cvslog] avfilter/af_aresample: Check ff_all_* for allocation failures
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri
Jul 17 20:27:25 2015 +0200| [2ea8a480832acad3095783bcb11d5f290bec56cf] |
committer: Michael Niedermayer
avfilter/af_aresample: Check ff_all_* for allocation failures
Fixes: signal_sigabrt_770eccc9_498_divx502.avi with memlimit 1572864
Found-by: Samuel Groß, Mateusz j00ru Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ea8a480832acad3095783bcb11d5f290bec56cf
---
libavfilter/af_aresample.c | 21 +++--
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c
index 57ac397..6cb765d 100644
--- a/libavfilter/af_aresample.c
+++ b/libavfilter/af_aresample.c
@@ -87,15 +87,24 @@ static int query_formats(AVFilterContext *ctx)
AVFilterLink *inlink = ctx-inputs[0];
AVFilterLink *outlink = ctx-outputs[0];
-AVFilterFormats*in_formats =
ff_all_formats(AVMEDIA_TYPE_AUDIO);
-AVFilterFormats*out_formats;
-AVFilterFormats*in_samplerates = ff_all_samplerates();
-AVFilterFormats*out_samplerates;
-AVFilterChannelLayouts *in_layouts = ff_all_channel_counts();
-AVFilterChannelLayouts *out_layouts;
+AVFilterFormats*in_formats, *out_formats;
+AVFilterFormats*in_samplerates, *out_samplerates;
+AVFilterChannelLayouts *in_layouts, *out_layouts;
+
+in_formats = ff_all_formats(AVMEDIA_TYPE_AUDIO);
+if (!in_formats)
+return AVERROR(ENOMEM);
ff_formats_ref (in_formats, inlink-out_formats);
+
+in_samplerates = ff_all_samplerates();
+if (!in_samplerates)
+return AVERROR(ENOMEM);
ff_formats_ref (in_samplerates, inlink-out_samplerates);
+
+in_layouts = ff_all_channel_counts();
+if (!in_layouts)
+ return AVERROR(ENOMEM);
ff_channel_layouts_ref(in_layouts, inlink-out_channel_layouts);
if(out_rate 0) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/af_dynaudnorm: Fix ISO C90 forbids mixed declarations and code warnings
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri
Jul 17 20:49:06 2015 +0200| [4c7c0d37e5c2ad5b046d1f543e47850c8b94403d] |
committer: Michael Niedermayer
avfilter/af_dynaudnorm: Fix ISO C90 forbids mixed declarations and code
warnings
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c7c0d37e5c2ad5b046d1f543e47850c8b94403d
---
libavfilter/af_dynaudnorm.c | 22 ++
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/libavfilter/af_dynaudnorm.c b/libavfilter/af_dynaudnorm.c
index fb83c20..ba3a008 100644
--- a/libavfilter/af_dynaudnorm.c
+++ b/libavfilter/af_dynaudnorm.c
@@ -430,8 +430,9 @@ static void
update_gain_history(DynamicAudioNormalizerContext *s, int channel,
cqueue_enqueue(s-gain_history_original[channel], current_gain_factor);
while (cqueue_size(s-gain_history_original[channel]) = s-filter_size) {
+double minimum;
av_assert0(cqueue_size(s-gain_history_original[channel]) ==
s-filter_size);
-const double minimum =
minimum_filter(s-gain_history_original[channel]);
+minimum = minimum_filter(s-gain_history_original[channel]);
cqueue_enqueue(s-gain_history_minimum[channel], minimum);
@@ -439,8 +440,9 @@ static void
update_gain_history(DynamicAudioNormalizerContext *s, int channel,
}
while (cqueue_size(s-gain_history_minimum[channel]) = s-filter_size) {
+double smoothed;
av_assert0(cqueue_size(s-gain_history_minimum[channel]) ==
s-filter_size);
-const double smoothed = gaussian_filter(s,
s-gain_history_minimum[channel]);
+smoothed = gaussian_filter(s, s-gain_history_minimum[channel]);
cqueue_enqueue(s-gain_history_smoothed[channel], smoothed);
@@ -463,11 +465,12 @@ static void
perform_dc_correction(DynamicAudioNormalizerContext *s, AVFrame *fra
for (c = 0; c s-channels; c++) {
double *dst_ptr = (double *)frame-extended_data[c];
double current_average_value = 0.0;
+double prev_value;
for (i = 0; i frame-nb_samples; i++)
current_average_value += dst_ptr[i] * diff;
-const double prev_value = is_first_frame ? current_average_value :
s-dc_correction_value[c];
+prev_value = is_first_frame ? current_average_value :
s-dc_correction_value[c];
s-dc_correction_value[c] = is_first_frame ? current_average_value :
update_value(current_average_value, s-dc_correction_value[c], 0.1);
for (i = 0; i frame-nb_samples; i++) {
@@ -534,10 +537,11 @@ static void
perform_compression(DynamicAudioNormalizerContext *s, AVFrame *frame
const double current_threshold = FFMIN(1.0, s-compress_factor *
standard_deviation);
const double prev_value = is_first_frame ? current_threshold :
s-compress_threshold[0];
+double prev_actual_thresh, curr_actual_thresh;
s-compress_threshold[0] = is_first_frame ? current_threshold :
update_value(current_threshold, s-compress_threshold[0], (1.0/3.0));
-const double prev_actual_thresh = setup_compress_thresh(prev_value);
-const double curr_actual_thresh =
setup_compress_thresh(s-compress_threshold[0]);
+prev_actual_thresh = setup_compress_thresh(prev_value);
+curr_actual_thresh = setup_compress_thresh(s-compress_threshold[0]);
for (c = 0; c s-channels; c++) {
double *const dst_ptr = (double *)frame-extended_data[c];
@@ -552,12 +556,14 @@ static void
perform_compression(DynamicAudioNormalizerContext *s, AVFrame *frame
const double current_threshold = setup_compress_thresh(FFMIN(1.0,
s-compress_factor * standard_deviation));
const double prev_value = is_first_frame ? current_threshold :
s-compress_threshold[c];
+double prev_actual_thresh, curr_actual_thresh;
+double *dst_ptr;
s-compress_threshold[c] = is_first_frame ? current_threshold :
update_value(current_threshold, s-compress_threshold[c], 1.0/3.0);
-const double prev_actual_thresh =
setup_compress_thresh(prev_value);
-const double curr_actual_thresh =
setup_compress_thresh(s-compress_threshold[c]);
+prev_actual_thresh = setup_compress_thresh(prev_value);
+curr_actual_thresh =
setup_compress_thresh(s-compress_threshold[c]);
-double *const dst_ptr = (double *)frame-extended_data[c];
+dst_ptr = (double *)frame-extended_data[c];
for (i = 0; i frame-nb_samples; i++) {
const double localThresh = fade(prev_actual_thresh,
curr_actual_thresh, i, s-fade_factors);
dst_ptr[i] = copysign(bound(localThresh, fabs(dst_ptr[i])),
dst_ptr[i]);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] libx264: Add support for the MPEG2 encoder
ffmpeg | branch: master | Luca Barbato lu_z...@gentoo.org | Fri Jul 10
14:45:14 2015 +0200| [e1319aa1c1be9b64117c19170344fb78841dd67c] | committer:
Luca Barbato
libx264: Add support for the MPEG2 encoder
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1319aa1c1be9b64117c19170344fb78841dd67c
---
configure |6 +-
libavcodec/Makefile|1 +
libavcodec/allcodecs.c |1 +
libavcodec/libx264.c | 49 +---
4 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
index 28115d3..31b97c3 100755
--- a/configure
+++ b/configure
@@ -1607,6 +1607,7 @@ CONFIG_EXTRA=
imdct15
intrax8
jpegtables
+libx262
lgplv3
lpc
me_cmp
@@ -2108,6 +2109,7 @@ libvpx_vp9_decoder_deps=libvpx
libvpx_vp9_encoder_deps=libvpx
libwavpack_encoder_deps=libwavpack
libwebp_encoder_deps=libwebp
+libx262_encoder_deps=libx262
libx264_encoder_deps=libx264
libx265_encoder_deps=libx265
libxavs_encoder_deps=libxavs
@@ -4351,7 +4353,9 @@ enabled libwavpack require libwavpack
wavpack/wavpack.h WavpackOpenFil
enabled libwebprequire_pkg_config libwebp webp/encode.h
WebPGetEncoderVersion
enabled libx264require_pkg_config x264 stdint.h x264.h
x264_encoder_encode
{ check_cpp_condition x264.h X264_BUILD = 118
||
- die ERROR: libx264 version must be = 0.118.;
}
+ die ERROR: libx264 version must be = 0.118.;
}
+ { check_cpp_condition x264.h X264_MPEG2
+ enable libx262; }
enabled libx265require_pkg_config x265 x265.h x265_api_get
{ check_cpp_condition x265.h X265_BUILD = 57 ||
die ERROR: libx265 version must be = 57.; }
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index d933ffd..008207b 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -671,6 +671,7 @@ OBJS-$(CONFIG_LIBVPX_VP9_DECODER) += libvpxdec.o
libvpx.o
OBJS-$(CONFIG_LIBVPX_VP9_ENCODER) += libvpxenc.o libvpx.o
OBJS-$(CONFIG_LIBWAVPACK_ENCODER) += libwavpackenc.o
OBJS-$(CONFIG_LIBWEBP_ENCODER)+= libwebpenc.o
+OBJS-$(CONFIG_LIBX262_ENCODER)+= libx264.o
OBJS-$(CONFIG_LIBX264_ENCODER)+= libx264.o
OBJS-$(CONFIG_LIBX265_ENCODER)+= libx265.o
OBJS-$(CONFIG_LIBXAVS_ENCODER)+= libxavs.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index a3f1550..9fdbe8f 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -473,6 +473,7 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (LIBVPX_VP9,libvpx_vp9);
REGISTER_ENCODER(LIBWAVPACK,libwavpack);
REGISTER_ENCODER(LIBWEBP, libwebp);
+REGISTER_ENCODER(LIBX262, libx262);
REGISTER_ENCODER(LIBX264, libx264);
REGISTER_ENCODER(LIBX265, libx265);
REGISTER_ENCODER(LIBXAVS, libxavs);
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 7c502fd..5d257ef 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -323,7 +323,14 @@ static av_cold int X264_init(AVCodecContext *avctx)
{
X264Context *x4 = avctx-priv_data;
+#if CONFIG_LIBX262_ENCODER
+if (avctx-codec_id == AV_CODEC_ID_MPEG2VIDEO) {
+x4-params.b_mpeg2 = 1;
+x264_param_default_mpeg2(x4-params);
+} else
+#else
x264_param_default(x4-params);
+#endif
x4-params.b_deblocking_filter = avctx-flags
CODEC_FLAG_LOOP_FILTER;
@@ -663,13 +670,6 @@ static const AVOption options[] = {
{ NULL },
};
-static const AVClass class = {
-.class_name = libx264,
-.item_name = av_default_item_name,
-.option = options,
-.version= LIBAVUTIL_VERSION_INT,
-};
-
static const AVCodecDefault x264_defaults[] = {
{ b,0 },
{ bf, -1 },
@@ -698,6 +698,14 @@ static const AVCodecDefault x264_defaults[] = {
{ NULL },
};
+#if CONFIG_LIBX264_ENCODER
+static const AVClass class = {
+.class_name = libx264,
+.item_name = av_default_item_name,
+.option = options,
+.version= LIBAVUTIL_VERSION_INT,
+};
+
AVCodec ff_libx264_encoder = {
.name = libx264,
.long_name= NULL_IF_CONFIG_SMALL(libx264 H.264 / AVC / MPEG-4 AVC
/ MPEG-4 part 10),
@@ -714,3 +722,30 @@ AVCodec ff_libx264_encoder = {
.caps_internal= FF_CODEC_CAP_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP,
};
+#endif
+
+#if CONFIG_LIBX262_ENCODER
+static const AVClass X262_class = {
+.class_name = libx262,
+.item_name = av_default_item_name,
+.option = options,
+.version= LIBAVUTIL_VERSION_INT,
+};
+
+AVCodec ff_libx262_encoder = {
+.name = libx262,
+.long_name=
[FFmpeg-cvslog] Merge commit 'e1319aa1c1be9b64117c19170344fb78841dd67c'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri Jul 17 21:21:03 2015 +0200| [e56f14659f580954626e8c1660771c593ecd74fa] | committer: Michael Niedermayer Merge commit 'e1319aa1c1be9b64117c19170344fb78841dd67c' * commit 'e1319aa1c1be9b64117c19170344fb78841dd67c': libx264: Add support for the MPEG2 encoder Conflicts: configure libavcodec/Makefile libavcodec/libx264.c Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e56f14659f580954626e8c1660771c593ecd74fa --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] OS/2: Cleanup slib_create_def_cmd
ffmpeg | branch: master | Dave Yeo dave.r@gmail.com | Thu Jul 16 22:21:11 2015 -0700| [4da585ae478f8b6f865ab13779af399aee20d899] | committer: Luca Barbato OS/2: Cleanup slib_create_def_cmd Export symbols by name rather then ordinal. Remove PROTMODE directive as it does not make sense for 32 bit library. Also silences a warning from some linkers. Signed-off-by: Dave Yeo dave.r@gmail.com Signed-off-by: Luca Barbato lu_z...@gentoo.org http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4da585ae478f8b6f865ab13779af399aee20d899 --- configure |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index 31b97c3..0dac109 100755 --- a/configure +++ b/configure @@ -3667,11 +3667,10 @@ case $target_os in SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(shell echo $(NAME) | cut -c1-6)$(LIBMAJOR)$(SLIBSUF)' SLIB_CREATE_DEF_CMD='echo LIBRARY $(SLIBNAME_WITH_MAJOR) INITINSTANCE TERMINSTANCE $(SUBDIR)$(NAME).def; \ -echo PROTMODE $(SUBDIR)$(NAME).def; \ echo CODE PRELOAD MOVEABLE DISCARDABLE $(SUBDIR)$(NAME).def; \ echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED $(SUBDIR)$(NAME).def; \ echo EXPORTS $(SUBDIR)$(NAME).def; \ -emxexp -o $(OBJS) $(SUBDIR)$(NAME).def' +emxexp $(OBJS) $(SUBDIR)$(NAME).def' SLIB_EXTRA_CMD='emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.a $(SUBDIR)$(NAME).def; \ emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib $(SUBDIR)$(NAME).def;' SLIB_INSTALL_EXTRA_LIB='$(LIBPREF)$(NAME)_dll.a $(LIBPREF)$(NAME)_dll.lib' ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '4da585ae478f8b6f865ab13779af399aee20d899'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri Jul 17 21:32:12 2015 +0200| [fd280de7eeb8657c406e89dd4c84b5ffab9c0508] | committer: Michael Niedermayer Merge commit '4da585ae478f8b6f865ab13779af399aee20d899' * commit '4da585ae478f8b6f865ab13779af399aee20d899': OS/2: Cleanup slib_create_def_cmd See: 22a0387df29c7450f57d09fbb24b7bc5f3b1fb89 Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd280de7eeb8657c406e89dd4c84b5ffab9c0508 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri Jul 17 21:42:14 2015 +0200| [948a15195c69da2ff9a4b0ac7df782ba1cc2795f] | committer: Michael Niedermayer Merge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0' * commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0': configure: Factor out flacdsp module Conflicts: configure libavcodec/Makefile libavcodec/arm/Makefile Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=948a15195c69da2ff9a4b0ac7df782ba1cc2795f --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: Factor out flacdsp module
ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Thu Jul 16 16:10:57 2015 +0100| [b075869bc1e1aadea0a8dc819ebfb758adb9e3d0] | committer: Vittorio Giovara configure: Factor out flacdsp module http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b075869bc1e1aadea0a8dc819ebfb758adb9e3d0 --- configure |5 +++-- libavcodec/Makefile |5 +++-- libavcodec/arm/Makefile |4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 0dac109..467bf99 100755 --- a/configure +++ b/configure @@ -1588,6 +1588,7 @@ CONFIG_EXTRA= faandct faanidct fdctdsp +flacdsp fmtconvert gcrypt gmp @@ -1841,8 +1842,8 @@ ffv1_encoder_select=rangecoder ffvhuff_decoder_select=huffyuv_decoder ffvhuff_encoder_select=huffyuv_encoder fic_decoder_select=golomb -flac_decoder_select=golomb -flac_encoder_select=bswapdsp golomb lpc +flac_decoder_select=flacdsp golomb +flac_encoder_select=bswapdsp flacdsp golomb lpc flashsv_decoder_deps=zlib flashsv_encoder_deps=zlib flashsv2_decoder_deps=zlib diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 008207b..61fd3a2 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -47,6 +47,7 @@ OBJS-$(CONFIG_FDCTDSP) += fdctdsp.o jfdctfst.o jfdctint.o FFT-OBJS-$(CONFIG_HARDCODED_TABLES)+= cos_tables.o cos_fixed_tables.o OBJS-$(CONFIG_FFT) += avfft.o fft_fixed.o fft_float.o \ $(FFT-OBJS-yes) +OBJS-$(CONFIG_FLACDSP) += flacdsp.o OBJS-$(CONFIG_FMTCONVERT) += fmtconvert.o OBJS-$(CONFIG_GOLOMB) += golomb.o OBJS-$(CONFIG_H263DSP) += h263dsp.o @@ -205,8 +206,8 @@ OBJS-$(CONFIG_EXR_DECODER) += exr.o OBJS-$(CONFIG_FFV1_DECODER)+= ffv1dec.o ffv1.o OBJS-$(CONFIG_FFV1_ENCODER)+= ffv1enc.o ffv1.o OBJS-$(CONFIG_FIC_DECODER) += fic.o -OBJS-$(CONFIG_FLAC_DECODER)+= flacdec.o flacdata.o flac.o flacdsp.o -OBJS-$(CONFIG_FLAC_ENCODER)+= flacenc.o flacdata.o flac.o flacdsp.o +OBJS-$(CONFIG_FLAC_DECODER)+= flacdec.o flacdata.o flac.o +OBJS-$(CONFIG_FLAC_ENCODER)+= flacenc.o flacdata.o flac.o OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o OBJS-$(CONFIG_FLASHSV_ENCODER) += flashsvenc.o OBJS-$(CONFIG_FLASHSV2_DECODER)+= flashsv.o diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index 57f5bc4..e9eea1a 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -18,6 +18,8 @@ OBJS-$(CONFIG_IDCTDSP) += arm/idctdsp_init_arm.o\ arm/idctdsp_arm.o \ arm/jrevdct_arm.o \ arm/simple_idct_arm.o +OBJS-$(CONFIG_FLACDSP) += arm/flacdsp_init_arm.o\ + arm/flacdsp_arm.o OBJS-$(CONFIG_ME_CMP) += arm/me_cmp_init_arm.o OBJS-$(CONFIG_MPEGAUDIODSP)+= arm/mpegaudiodsp_init_arm.o OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_arm.o @@ -32,8 +34,6 @@ OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_init_arm.o \ arm/sbrdsp_init_arm.o OBJS-$(CONFIG_APE_DECODER) += arm/apedsp_init_arm.o OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_init_arm.o -OBJS-$(CONFIG_FLAC_DECODER)+= arm/flacdsp_init_arm.o\ - arm/flacdsp_arm.o OBJS-$(CONFIG_ADPCM_G722_DECODER) += arm/g722dsp_init_arm.o OBJS-$(CONFIG_ADPCM_G722_ENCODER) += arm/g722dsp_init_arm.o OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_init_arm.o ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/libx264: fix MPEG2 support
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri Jul 17 22:10:58 2015 +0200| [189f2ed902a6044a4eba4a2ef221afefd69d8eec] | committer: Michael Niedermayer avcodec/libx264: fix MPEG2 support Found-by: rcombs Signed-off-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=189f2ed902a6044a4eba4a2ef221afefd69d8eec --- libavcodec/libx264.c |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 4487fef..3e789e5 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -389,9 +389,8 @@ static av_cold int X264_init(AVCodecContext *avctx) x4-params.b_mpeg2 = 1; x264_param_default_mpeg2(x4-params); } else -#else -x264_param_default(x4-params); #endif +x264_param_default(x4-params); x4-params.b_deblocking_filter = avctx-flags CODEC_FLAG_LOOP_FILTER; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat: increase first_frames threshold for mp3, ac3
ffmpeg | branch: master | Ganesh Ajjanagadde gajjanaga...@gmail.com | Fri Jul 17 22:09:48 2015 -0400| [f6870495e1589f0931f62bdf777fc0ad299e9c14] | committer: Michael Niedermayer avformat: increase first_frames threshold for mp3,ac3 Fixes Ticket4723 Signed-off-by: Ganesh Ajjanagadde gajjanaga...@gmail.com Signed-off-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6870495e1589f0931f62bdf777fc0ad299e9c14 --- libavformat/ac3dec.c |2 +- libavformat/mp3dec.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c index 58ef44d..bef55cb 100644 --- a/libavformat/ac3dec.c +++ b/libavformat/ac3dec.c @@ -80,7 +80,7 @@ static int ac3_eac3_probe(AVProbeData *p, enum AVCodecID expected_codec_id) if(codec_id != expected_codec_id) return 0; // keep this in sync with mp3 probe, both need to avoid // issues with MPEG-files! -if (first_frames=4) return AVPROBE_SCORE_EXTENSION + 1; +if (first_frames=7) return AVPROBE_SCORE_EXTENSION + 1; else if(max_frames200)return AVPROBE_SCORE_EXTENSION; else if(max_frames=4) return AVPROBE_SCORE_EXTENSION/2; else if(max_frames=1) return 1; diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 731dc63..20af7bc 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -98,7 +98,7 @@ static int mp3_read_probe(AVProbeData *p) avcodec_free_context(avctx); // keep this in sync with ac3 probe, both need to avoid // issues with MPEG-files! -if (first_frames=4) return AVPROBE_SCORE_EXTENSION + 1; +if (first_frames=7) return AVPROBE_SCORE_EXTENSION + 1; else if(max_frames200)return AVPROBE_SCORE_EXTENSION; else if(max_frames=4 max_frames = p-buf_size/1) return AVPROBE_SCORE_EXTENSION / 2; else if(ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC) 2*ff_id3v2_tag_len(buf0) = p-buf_size) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: Factor out rv34dsp module
ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Thu Jul 16 16:11:00 2015 +0100| [5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418] | committer: Vittorio Giovara configure: Factor out rv34dsp module http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418 --- configure |5 +++-- libavcodec/Makefile |5 +++-- libavcodec/arm/Makefile |5 ++--- libavcodec/x86/Makefile | 10 -- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/configure b/configure index ce4e6cc..aa9665a 100755 --- a/configure +++ b/configure @@ -1629,6 +1629,7 @@ CONFIG_EXTRA= riffenc rtpdec rtpenc_chain +rv34dsp sinewin snappy startcode @@ -1947,8 +1948,8 @@ rv10_decoder_select=error_resilience h263_decoder h263dsp mpeg_er rv10_encoder_select=h263_encoder rv20_decoder_select=error_resilience h263_decoder h263dsp mpeg_er rv20_encoder_select=h263_encoder -rv30_decoder_select=error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo videodsp -rv40_decoder_select=error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo videodsp +rv30_decoder_select=error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo rv34dsp videodsp +rv40_decoder_select=error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo rv34dsp videodsp shorten_decoder_select=golomb sipr_decoder_select=lsp sp5x_decoder_select=mjpeg_decoder diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a484b4e..0d0f0de 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -93,6 +93,7 @@ OBJS-$(CONFIG_QSVENC) += qsvenc.o OBJS-$(CONFIG_RANGECODER) += rangecoder.o RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o OBJS-$(CONFIG_RDFT)+= rdft.o $(RDFT-OBJS-yes) +OBJS-$(CONFIG_RV34DSP) += rv34dsp.o OBJS-$(CONFIG_SINEWIN) += sinewin.o OBJS-$(CONFIG_SNAPPY) += snappy.o OBJS-$(CONFIG_STARTCODE) += startcode.o @@ -373,8 +374,8 @@ OBJS-$(CONFIG_RV10_DECODER)+= rv10.o OBJS-$(CONFIG_RV10_ENCODER)+= rv10enc.o OBJS-$(CONFIG_RV20_DECODER)+= rv10.o OBJS-$(CONFIG_RV20_ENCODER)+= rv20enc.o -OBJS-$(CONFIG_RV30_DECODER)+= rv30.o rv34.o rv30dsp.o rv34dsp.o -OBJS-$(CONFIG_RV40_DECODER)+= rv40.o rv34.o rv34dsp.o rv40dsp.o +OBJS-$(CONFIG_RV30_DECODER)+= rv30.o rv34.o rv30dsp.o +OBJS-$(CONFIG_RV40_DECODER)+= rv40.o rv34.o rv40dsp.o OBJS-$(CONFIG_S302M_DECODER) += s302m.o OBJS-$(CONFIG_SANM_DECODER)+= sanm.o OBJS-$(CONFIG_SGI_DECODER) += sgidec.o diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index e9eea1a..a9d1e02 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -26,6 +26,7 @@ OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_arm.o OBJS-$(CONFIG_MPEGVIDEOENC)+= arm/mpegvideoencdsp_init_arm.o OBJS-$(CONFIG_NEON_CLOBBER_TEST) += arm/neontest.o OBJS-$(CONFIG_PIXBLOCKDSP) += arm/pixblockdsp_init_arm.o +OBJS-$(CONFIG_RV34DSP) += arm/rv34dsp_init_arm.o OBJS-$(CONFIG_VIDEODSP)+= arm/videodsp_init_arm.o OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_init_arm.o @@ -37,14 +38,12 @@ OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_init_arm.o OBJS-$(CONFIG_ADPCM_G722_DECODER) += arm/g722dsp_init_arm.o OBJS-$(CONFIG_ADPCM_G722_ENCODER) += arm/g722dsp_init_arm.o OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_init_arm.o +OBJS-$(CONFIG_RV40_DECODER)+= arm/rv40dsp_init_arm.o OBJS-$(CONFIG_VC1_DECODER) += arm/vc1dsp_init_arm.o OBJS-$(CONFIG_VORBIS_DECODER) += arm/vorbisdsp_init_arm.o OBJS-$(CONFIG_VP6_DECODER) += arm/vp6dsp_init_arm.o OBJS-$(CONFIG_VP7_DECODER) += arm/vp8dsp_init_arm.o OBJS-$(CONFIG_VP8_DECODER) += arm/vp8dsp_init_arm.o -OBJS-$(CONFIG_RV30_DECODER)+= arm/rv34dsp_init_arm.o -OBJS-$(CONFIG_RV40_DECODER)+= arm/rv34dsp_init_arm.o\ - arm/rv40dsp_init_arm.o # ARMv5 optimizations diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 09bb6a2..aa633b1 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -27,6 +27,7 @@ OBJS-$(CONFIG_MPEGVIDEOENC)+= x86/mpegvideoenc.o \ x86/mpegvideoencdsp_init.o OBJS-$(CONFIG_PIXBLOCKDSP) += x86/pixblockdsp_init.o OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp_init.o +OBJS-$(CONFIG_RV34DSP) += x86/rv34dsp_init.o OBJS-$(CONFIG_VIDEODSP)+= x86/videodsp_init.o OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp_init.o OBJS-$(CONFIG_XMM_CLOBBER_TEST)+= x86/w64xmmtest.o
[FFmpeg-cvslog] Merge commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri Jul 17 22:31:41 2015 +0200| [3500eccb8e7fce470a8cf746fdd4bc1ee0798215] | committer: Michael Niedermayer Merge commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b' * commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b': configure: Factor out vp56dsp module Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3500eccb8e7fce470a8cf746fdd4bc1ee0798215 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: Factor out vp56dsp module
ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Thu Jul 16 16:11:01 2015 +0100| [d4aea1aa4060fb5ba7f5f426823b697d2a5af08b] | committer: Vittorio Giovara configure: Factor out vp56dsp module http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d4aea1aa4060fb5ba7f5f426823b697d2a5af08b --- configure |5 +++-- libavcodec/Makefile |6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure b/configure index aa9665a..40fa867 100755 --- a/configure +++ b/configure @@ -1638,6 +1638,7 @@ CONFIG_EXTRA= tpeldsp videodsp vp3dsp +vp56dsp wma_freqs @@ -1978,8 +1979,8 @@ vc1image_decoder_select=vc1_decoder vorbis_decoder_select=mdct vorbis_encoder_select=mdct vp3_decoder_select=hpeldsp vp3dsp videodsp -vp5_decoder_select=h264chroma hpeldsp videodsp vp3dsp -vp6_decoder_select=h264chroma hpeldsp huffman videodsp vp3dsp +vp5_decoder_select=h264chroma hpeldsp videodsp vp3dsp vp56dsp +vp6_decoder_select=h264chroma hpeldsp huffman videodsp vp3dsp vp56dsp vp6a_decoder_select=vp6_decoder vp6f_decoder_select=vp6_decoder vp7_decoder_select=h264pred videodsp diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0d0f0de..d65218d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -102,6 +102,7 @@ OBJS-$(CONFIG_TEXTUREDSPENC) += texturedspenc.o OBJS-$(CONFIG_TPELDSP) += tpeldsp.o OBJS-$(CONFIG_VIDEODSP)+= videodsp.o OBJS-$(CONFIG_VP3DSP) += vp3dsp.o +OBJS-$(CONFIG_VP56DSP) += vp56dsp.o OBJS-$(CONFIG_WMA_FREQS) += wma_freqs.o # decoders/encoders @@ -437,9 +438,8 @@ OBJS-$(CONFIG_VORBIS_DECODER) += vorbisdec.o vorbisdsp.o vorbis.o \ OBJS-$(CONFIG_VORBIS_ENCODER) += vorbisenc.o vorbis.o \ vorbis_data.o OBJS-$(CONFIG_VP3_DECODER) += vp3.o -OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o vp56dsp.o \ - vp56rac.o -OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o vp56dsp.o \ +OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o vp56rac.o +OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o \ vp6dsp.o vp56rac.o OBJS-$(CONFIG_VP7_DECODER) += vp8.o vp8dsp.o vp56rac.o OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp8dsp.o vp56rac.o ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit 'c9f8cfb6d9b34f3c51f1b7152c4dc3f2f8724dc4'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Sat Jul 18 02:38:54 2015 +0200| [9010be252e57bf9cb907ff298dbc73017bf6a33f] | committer: Michael Niedermayer Merge commit 'c9f8cfb6d9b34f3c51f1b7152c4dc3f2f8724dc4' * commit 'c9f8cfb6d9b34f3c51f1b7152c4dc3f2f8724dc4': fate: add checkasm target Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9010be252e57bf9cb907ff298dbc73017bf6a33f --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] checkasm: test all architectures with optimisations
ffmpeg | branch: master | Janne Grunau janne-li...@jannau.net | Sun Jul 12
16:41:42 2015 +0200| [82e6ac85ff9aa7631b8c01521b3d6b5ca0bc8014] | committer:
Janne Grunau
checkasm: test all architectures with optimisations
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82e6ac85ff9aa7631b8c01521b3d6b5ca0bc8014
---
tests/checkasm/checkasm.c | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index 826cd35..e6cf3d7 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -72,7 +72,21 @@ static const struct {
const char *suffix;
int flag;
} cpus[] = {
-#if ARCH_X86
+#if ARCH_AARCH64
+{ ARMV8,armv8,AV_CPU_FLAG_ARMV8 },
+{ NEON, neon, AV_CPU_FLAG_NEON },
+#elif ARCH_ARM
+{ ARMV5TE, armv5te, AV_CPU_FLAG_ARMV5TE },
+{ ARMV6,armv6,AV_CPU_FLAG_ARMV6 },
+{ ARMV6T2, armv6t2, AV_CPU_FLAG_ARMV6T2 },
+{ VFP, vfp, AV_CPU_FLAG_VFP },
+{ VFPV3,vfp3, AV_CPU_FLAG_VFPV3 },
+{ NEON, neon, AV_CPU_FLAG_NEON },
+#elif ARCH_PPC
+{ ALTIVEC, altivec, AV_CPU_FLAG_ALTIVEC },
+{ VSX, vsx, AV_CPU_FLAG_VSX },
+{ POWER8, power8, AV_CPU_FLAG_POWER8 },
+#elif ARCH_X86
{ MMX, mmx, AV_CPU_FLAG_MMX|AV_CPU_FLAG_CMOV },
{ MMXEXT, mmxext, AV_CPU_FLAG_MMXEXT },
{ 3DNOW,3dnow,AV_CPU_FLAG_3DNOW },
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '82e6ac85ff9aa7631b8c01521b3d6b5ca0bc8014'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Sat Jul 18 02:31:07 2015 +0200| [e6b01480e563bb71cb525393a9b239968730d6ec] | committer: Michael Niedermayer Merge commit '82e6ac85ff9aa7631b8c01521b3d6b5ca0bc8014' * commit '82e6ac85ff9aa7631b8c01521b3d6b5ca0bc8014': checkasm: test all architectures with optimisations Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6b01480e563bb71cb525393a9b239968730d6ec --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] x86: bswapdsp: Don't treat 32-bit integers as 64-bit
ffmpeg | branch: master | Henrik Gramner hen...@gramner.com | Thu Jul 16 00:10:27 2015 +0200| [a344e5d094ebcf9a23acf3a27c56cbbbc829db42] | committer: Luca Barbato x86: bswapdsp: Don't treat 32-bit integers as 64-bit The upper halves are not guaranteed to be zero in x86-64. Also use `test` instead of `and` when the result isn't used for anything other than as a branch condition, this allows some register moves to be eliminated. Signed-off-by: Luca Barbato lu_z...@gentoo.org http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a344e5d094ebcf9a23acf3a27c56cbbbc829db42 --- libavcodec/x86/bswapdsp.asm | 23 ++- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/libavcodec/x86/bswapdsp.asm b/libavcodec/x86/bswapdsp.asm index 17a6cb1..42580a3 100644 --- a/libavcodec/x86/bswapdsp.asm +++ b/libavcodec/x86/bswapdsp.asm @@ -28,8 +28,8 @@ SECTION_TEXT ; %1 = aligned/unaligned %macro BSWAP_LOOPS 1 -mov r3, r2 -sar r2, 3 +mov r3d, r2d +sar r2d, 3 jz .left4_%1 .loop8_%1: mov%1m0, [r1 + 0] @@ -57,11 +57,11 @@ SECTION_TEXT %endif add r0, 32 add r1, 32 -dec r2 +dec r2d jnz .loop8_%1 .left4_%1: -mov r2, r3 -and r3, 4 +mov r2d, r3d +test r3d, 4 jz .left mov%1m0, [r1] %if cpuflag(ssse3) @@ -84,13 +84,11 @@ SECTION_TEXT %macro BSWAP32_BUF 0 %if cpuflag(ssse3) cglobal bswap32_buf, 3,4,3 -mov r3, r1 mova m2, [pb_bswap32] %else cglobal bswap32_buf, 3,4,5 -mov r3, r1 %endif -and r3, 15 +test r1, 15 jz .start_align BSWAP_LOOPS u jmp .left @@ -98,8 +96,7 @@ cglobal bswap32_buf, 3,4,5 BSWAP_LOOPS a .left: %if cpuflag(ssse3) -mov r3, r2 -and r2, 2 +test r2d, 2 jz .left1 movq m0, [r1] pshufb m0, m2 @@ -107,13 +104,13 @@ cglobal bswap32_buf, 3,4,5 add r1, 8 add r0, 8 .left1: -and r3, 1 +test r2d, 1 jz .end mov r2d, [r1] bswapr2d mov [r0], r2d %else -and r2, 3 +and r2d, 3 jz .end .loop2: mov r3d, [r1] @@ -121,7 +118,7 @@ cglobal bswap32_buf, 3,4,5 mov [r0], r3d add r1, 4 add r0, 4 -dec r2 +dec r2d jnz .loop2 %endif .end: ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit 'd37f23263584774e1798e9ac909a398304a05091'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri Jul 17 23:26:42 2015 +0200| [72d1409e23803e8314145f610e84b47a44ba3dbc] | committer: Michael Niedermayer Merge commit 'd37f23263584774e1798e9ac909a398304a05091' * commit 'd37f23263584774e1798e9ac909a398304a05091': checkasm: Add unit tests for bswapdsp Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72d1409e23803e8314145f610e84b47a44ba3dbc --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] checkasm: Add unit tests for bswapdsp
ffmpeg | branch: master | Henrik Gramner hen...@gramner.com | Thu Jul 16
00:10:28 2015 +0200| [d37f23263584774e1798e9ac909a398304a05091] | committer:
Luca Barbato
checkasm: Add unit tests for bswapdsp
Signed-off-by: Luca Barbato lu_z...@gentoo.org
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d37f23263584774e1798e9ac909a398304a05091
---
tests/checkasm/Makefile |1 +
tests/checkasm/bswapdsp.c | 73 +
tests/checkasm/checkasm.c |3 ++
tests/checkasm/checkasm.h |1 +
4 files changed, 78 insertions(+)
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index 0758746..483ad13 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -1,4 +1,5 @@
# libavcodec tests
+AVCODECOBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o
AVCODECOBJS-$(CONFIG_H264PRED) += h264pred.o
AVCODECOBJS-$(CONFIG_H264QPEL) += h264qpel.o
diff --git a/tests/checkasm/bswapdsp.c b/tests/checkasm/bswapdsp.c
new file mode 100644
index 000..7b1566b
--- /dev/null
+++ b/tests/checkasm/bswapdsp.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2015 Henrik Gramner
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include string.h
+#include checkasm.h
+#include libavcodec/bswapdsp.h
+#include libavutil/common.h
+#include libavutil/intreadwrite.h
+
+#define BUF_SIZE 512
+
+#define randomize_buffers()\
+do {\
+int i;\
+for (i = 0; i BUF_SIZE; i += 4) {\
+uint32_t r = rnd();\
+AV_WN32A(src0+i, r);\
+AV_WN32A(src1+i, r);\
+r = rnd();\
+AV_WN32A(dst0+i, r);\
+AV_WN32A(dst1+i, r);\
+}\
+} while (0)
+
+#define check_bswap(type)\
+do {\
+int w;\
+for (w = 0; w BUF_SIZE/sizeof(type); w++) {\
+int offset = (BUF_SIZE/sizeof(type) - w) 15; /* Test various
alignments */\
+randomize_buffers();\
+call_ref((type*)dst0+offset, (type*)src0+offset, w);\
+call_new((type*)dst1+offset, (type*)src1+offset, w);\
+if (memcmp(src0, src1, BUF_SIZE) || memcmp(dst0, dst1, BUF_SIZE))\
+fail();\
+bench_new((type*)dst1+offset, (type*)src1+offset, w);\
+}\
+} while (0)
+
+void checkasm_check_bswapdsp(void)
+{
+DECLARE_ALIGNED(16, uint8_t, src0)[BUF_SIZE];
+DECLARE_ALIGNED(16, uint8_t, src1)[BUF_SIZE];
+DECLARE_ALIGNED(16, uint8_t, dst0)[BUF_SIZE];
+DECLARE_ALIGNED(16, uint8_t, dst1)[BUF_SIZE];
+BswapDSPContext h;
+
+ff_bswapdsp_init(h);
+
+if (check_func(h.bswap_buf, bswap_buf))
+check_bswap(uint32_t);
+
+if (check_func(h.bswap16_buf, bswap16_buf))
+check_bswap(uint16_t);
+
+report(bswap);
+}
diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index 7b1ea8f..ce73778 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -54,6 +54,9 @@
/* List of tests to invoke */
static void (* const tests[])(void) = {
+#if CONFIG_BSWAPDSP
+checkasm_check_bswapdsp,
+#endif
#if CONFIG_H264PRED
checkasm_check_h264pred,
#endif
diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index 1a46e9b..c2e359f 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -29,6 +29,7 @@
#include libavutil/lfg.h
#include libavutil/timer.h
+void checkasm_check_bswapdsp(void);
void checkasm_check_h264pred(void);
void checkasm_check_h264qpel(void);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: Factor out wmv2dsp module
ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Thu Jul 16 16:11:03 2015 +0100| [a623aa0069dff586241ad2ffedcd45ed840e2553] | committer: Vittorio Giovara configure: Factor out wmv2dsp module http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a623aa0069dff586241ad2ffedcd45ed840e2553 --- configure |5 +++-- libavcodec/Makefile |5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 62e9e37..0ed1193 100755 --- a/configure +++ b/configure @@ -1641,6 +1641,7 @@ CONFIG_EXTRA= vp56dsp vp8dsp wma_freqs +wmv2dsp CMDLINE_SELECT= @@ -1996,8 +1997,8 @@ wmav2_encoder_select=mdct sinewin wma_freqs wmavoice_decoder_select=lsp rdft dct mdct sinewin wmv1_decoder_select=h263_decoder wmv1_encoder_select=h263_encoder -wmv2_decoder_select=blockdsp h263_decoder idctdsp intrax8 videodsp -wmv2_encoder_select=h263_encoder +wmv2_decoder_select=blockdsp h263_decoder idctdsp intrax8 videodsp wmv2dsp +wmv2_encoder_select=h263_encoder wmv2dsp wmv3_decoder_select=vc1_decoder wmv3image_decoder_select=wmv3_decoder zerocodec_decoder_deps=zlib diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 38fdbbd..6bc9ff7 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -105,6 +105,7 @@ OBJS-$(CONFIG_VP3DSP) += vp3dsp.o OBJS-$(CONFIG_VP56DSP) += vp56dsp.o OBJS-$(CONFIG_VP8DSP) += vp8dsp.o OBJS-$(CONFIG_WMA_FREQS) += wma_freqs.o +OBJS-$(CONFIG_WMV2DSP) += wmv2dsp.o # decoders/encoders OBJS-$(CONFIG_A64MULTI_ENCODER)+= a64multienc.o elbg.o @@ -459,9 +460,9 @@ OBJS-$(CONFIG_WMAVOICE_DECODER)+= wmavoice.o \ celp_filters.o \ acelp_vectors.o acelp_filters.o OBJS-$(CONFIG_WMV1_DECODER)+= msmpeg4dec.o msmpeg4.o msmpeg4data.o -OBJS-$(CONFIG_WMV2_DECODER)+= wmv2dec.o wmv2.o wmv2dsp.o \ +OBJS-$(CONFIG_WMV2_DECODER)+= wmv2dec.o wmv2.o \ msmpeg4dec.o msmpeg4.o msmpeg4data.o -OBJS-$(CONFIG_WMV2_ENCODER)+= wmv2enc.o wmv2.o wmv2dsp.o \ +OBJS-$(CONFIG_WMV2_ENCODER)+= wmv2enc.o wmv2.o \ msmpeg4.o msmpeg4enc.o msmpeg4data.o OBJS-$(CONFIG_WNV1_DECODER)+= wnv1.o OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] h264: arm: use intra pred8x8 functions only for chroma_format_idc = 1
ffmpeg | branch: master | Janne Grunau janne-li...@jannau.net | Sun Jul 12
17:03:13 2015 +0200| [256ef19844892c6cf8e0386e3287bae970ec6320] | committer:
Janne Grunau
h264: arm: use intra pred8x8 functions only for chroma_format_idc = 1
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=256ef19844892c6cf8e0386e3287bae970ec6320
---
libavcodec/arm/h264pred_init_arm.c | 30 --
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/libavcodec/arm/h264pred_init_arm.c
b/libavcodec/arm/h264pred_init_arm.c
index bbfe63f..a445d4d 100644
--- a/libavcodec/arm/h264pred_init_arm.c
+++ b/libavcodec/arm/h264pred_init_arm.c
@@ -54,20 +54,22 @@ static av_cold void h264_pred_init_neon(H264PredContext *h,
int codec_id,
if (high_depth)
return;
-h-pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon;
-h-pred8x8[HOR_PRED8x8 ] = ff_pred8x8_hor_neon;
-if (codec_id != AV_CODEC_ID_VP7 codec_id != AV_CODEC_ID_VP8)
-h-pred8x8[PLANE_PRED8x8] = ff_pred8x8_plane_neon;
-h-pred8x8[DC_128_PRED8x8 ] = ff_pred8x8_128_dc_neon;
-if (codec_id != AV_CODEC_ID_RV40 codec_id != AV_CODEC_ID_VP7
-codec_id != AV_CODEC_ID_VP8) {
-h-pred8x8[DC_PRED8x8 ] = ff_pred8x8_dc_neon;
-h-pred8x8[LEFT_DC_PRED8x8] = ff_pred8x8_left_dc_neon;
-h-pred8x8[TOP_DC_PRED8x8 ] = ff_pred8x8_top_dc_neon;
-h-pred8x8[ALZHEIMER_DC_L0T_PRED8x8] = ff_pred8x8_l0t_dc_neon;
-h-pred8x8[ALZHEIMER_DC_0LT_PRED8x8] = ff_pred8x8_0lt_dc_neon;
-h-pred8x8[ALZHEIMER_DC_L00_PRED8x8] = ff_pred8x8_l00_dc_neon;
-h-pred8x8[ALZHEIMER_DC_0L0_PRED8x8] = ff_pred8x8_0l0_dc_neon;
+if (chroma_format_idc = 1) {
+h-pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon;
+h-pred8x8[HOR_PRED8x8 ] = ff_pred8x8_hor_neon;
+if (codec_id != AV_CODEC_ID_VP7 codec_id != AV_CODEC_ID_VP8)
+h-pred8x8[PLANE_PRED8x8] = ff_pred8x8_plane_neon;
+h-pred8x8[DC_128_PRED8x8 ] = ff_pred8x8_128_dc_neon;
+if (codec_id != AV_CODEC_ID_RV40 codec_id != AV_CODEC_ID_VP7
+codec_id != AV_CODEC_ID_VP8) {
+h-pred8x8[DC_PRED8x8 ] = ff_pred8x8_dc_neon;
+h-pred8x8[LEFT_DC_PRED8x8] = ff_pred8x8_left_dc_neon;
+h-pred8x8[TOP_DC_PRED8x8 ] = ff_pred8x8_top_dc_neon;
+h-pred8x8[ALZHEIMER_DC_L0T_PRED8x8] = ff_pred8x8_l0t_dc_neon;
+h-pred8x8[ALZHEIMER_DC_0LT_PRED8x8] = ff_pred8x8_0lt_dc_neon;
+h-pred8x8[ALZHEIMER_DC_L00_PRED8x8] = ff_pred8x8_l00_dc_neon;
+h-pred8x8[ALZHEIMER_DC_0L0_PRED8x8] = ff_pred8x8_0l0_dc_neon;
+}
}
h-pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_neon;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '2edc77dc7be5f4a006c6295f4c827e5471f85262'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri Jul 17 21:51:13 2015 +0200| [ccd3edf81fc2f5a70f1218ce0b3595481bfec0e6] | committer: Michael Niedermayer Merge commit '2edc77dc7be5f4a006c6295f4c827e5471f85262' * commit '2edc77dc7be5f4a006c6295f4c827e5471f85262': configure: Factor out ividsp module Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ccd3edf81fc2f5a70f1218ce0b3595481bfec0e6 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: Factor out vp8dsp module
ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Thu Jul 16 16:11:02 2015 +0100| [d42191c78befc1983f23b1899b2dda513b72f1ed] | committer: Vittorio Giovara configure: Factor out vp8dsp module http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d42191c78befc1983f23b1899b2dda513b72f1ed --- configure |5 +++-- libavcodec/Makefile |5 +++-- libavcodec/arm/Makefile | 18 ++ libavcodec/ppc/Makefile |2 +- libavcodec/x86/Makefile |9 +++-- 5 files changed, 16 insertions(+), 23 deletions(-) diff --git a/configure b/configure index 40fa867..62e9e37 100755 --- a/configure +++ b/configure @@ -1639,6 +1639,7 @@ CONFIG_EXTRA= videodsp vp3dsp vp56dsp +vp8dsp wma_freqs @@ -1983,8 +1984,8 @@ vp5_decoder_select=h264chroma hpeldsp videodsp vp3dsp vp56dsp vp6_decoder_select=h264chroma hpeldsp huffman videodsp vp3dsp vp56dsp vp6a_decoder_select=vp6_decoder vp6f_decoder_select=vp6_decoder -vp7_decoder_select=h264pred videodsp -vp8_decoder_select=h264pred videodsp +vp7_decoder_select=h264pred videodsp vp8dsp +vp8_decoder_select=h264pred videodsp vp8dsp vp9_decoder_select=videodsp webp_decoder_select=vp8_decoder wmapro_decoder_select=mdct sinewin wma_freqs diff --git a/libavcodec/Makefile b/libavcodec/Makefile index d65218d..38fdbbd 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -103,6 +103,7 @@ OBJS-$(CONFIG_TPELDSP) += tpeldsp.o OBJS-$(CONFIG_VIDEODSP)+= videodsp.o OBJS-$(CONFIG_VP3DSP) += vp3dsp.o OBJS-$(CONFIG_VP56DSP) += vp56dsp.o +OBJS-$(CONFIG_VP8DSP) += vp8dsp.o OBJS-$(CONFIG_WMA_FREQS) += wma_freqs.o # decoders/encoders @@ -441,8 +442,8 @@ OBJS-$(CONFIG_VP3_DECODER) += vp3.o OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o vp56rac.o OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o \ vp6dsp.o vp56rac.o -OBJS-$(CONFIG_VP7_DECODER) += vp8.o vp8dsp.o vp56rac.o -OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp8dsp.o vp56rac.o +OBJS-$(CONFIG_VP7_DECODER) += vp8.o vp56rac.o +OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp56rac.o OBJS-$(CONFIG_VP9_DECODER) += vp9.o vp9data.o vp9dsp.o \ vp9block.o vp9prob.o vp9mvs.o vp56rac.o OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index a9d1e02..c692717 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -29,6 +29,7 @@ OBJS-$(CONFIG_PIXBLOCKDSP) += arm/pixblockdsp_init_arm.o OBJS-$(CONFIG_RV34DSP) += arm/rv34dsp_init_arm.o OBJS-$(CONFIG_VIDEODSP)+= arm/videodsp_init_arm.o OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_init_arm.o +OBJS-$(CONFIG_VP8DSP) += arm/vp8dsp_init_arm.o # decoders/encoders OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_init_arm.o \ @@ -42,8 +43,6 @@ OBJS-$(CONFIG_RV40_DECODER)+= arm/rv40dsp_init_arm.o OBJS-$(CONFIG_VC1_DECODER) += arm/vc1dsp_init_arm.o OBJS-$(CONFIG_VORBIS_DECODER) += arm/vorbisdsp_init_arm.o OBJS-$(CONFIG_VP6_DECODER) += arm/vp6dsp_init_arm.o -OBJS-$(CONFIG_VP7_DECODER) += arm/vp8dsp_init_arm.o -OBJS-$(CONFIG_VP8_DECODER) += arm/vp8dsp_init_arm.o # ARMv5 optimizations @@ -71,16 +70,13 @@ ARMV6-OBJS-$(CONFIG_ME_CMP)+= arm/me_cmp_armv6.o ARMV6-OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_fixed_armv6.o ARMV6-OBJS-$(CONFIG_MPEGVIDEOENC) += arm/mpegvideoencdsp_armv6.o ARMV6-OBJS-$(CONFIG_PIXBLOCKDSP) += arm/pixblockdsp_armv6.o +ARMV6-OBJS-$(CONFIG_VP8DSP)+= arm/vp8_armv6.o \ + arm/vp8dsp_init_armv6.o \ + arm/vp8dsp_armv6.o # decoders/encoders ARMV6-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv6.o ARMV6-OBJS-$(CONFIG_STARTCODE) += arm/startcode_armv6.o -ARMV6-OBJS-$(CONFIG_VP7_DECODER) += arm/vp8_armv6.o \ - arm/vp8dsp_init_armv6.o \ - arm/vp8dsp_armv6.o -ARMV6-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8_armv6.o \ - arm/vp8dsp_init_armv6.o \ - arm/vp8dsp_armv6.o # VFP optimizations @@ -123,6 +119,8 @@ NEON-OBJS-$(CONFIG_MDCT) += arm/mdct_neon.o \ NEON-OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_neon.o NEON-OBJS-$(CONFIG_RDFT) += arm/rdft_neon.o NEON-OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_neon.o +NEON-OBJS-$(CONFIG_VP8DSP) +=
[FFmpeg-cvslog] Merge commit '6cc4d3e9a982e926494f4b919d9733fe29774acf'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Sat Jul 18 02:22:39 2015 +0200| [78274b19f163547ecb664e8254738d680212ffb6] | committer: Michael Niedermayer Merge commit '6cc4d3e9a982e926494f4b919d9733fe29774acf' * commit '6cc4d3e9a982e926494f4b919d9733fe29774acf': checkasm: exit with status 0 instead of 1 if there are no tests to perform Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78274b19f163547ecb664e8254738d680212ffb6 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: Factor out ividsp module
ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Thu Jul 16 16:10:58 2015 +0100| [2edc77dc7be5f4a006c6295f4c827e5471f85262] | committer: Vittorio Giovara configure: Factor out ividsp module http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2edc77dc7be5f4a006c6295f4c827e5471f85262 --- configure |3 +++ libavcodec/Makefile |5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 467bf99..8de84df 100755 --- a/configure +++ b/configure @@ -1607,6 +1607,7 @@ CONFIG_EXTRA= iirfilter imdct15 intrax8 +ividsp jpegtables libx262 lgplv3 @@ -1878,6 +1879,8 @@ huffyuv_encoder_select=bswapdsp huffman huffyuvencdsp iac_decoder_select=imc_decoder imc_decoder_select=bswapdsp fft mdct sinewin indeo3_decoder_select=hpeldsp +indeo4_decoder_select=ividsp +indeo5_decoder_select=ividsp interplay_video_decoder_select=hpeldsp jpegls_decoder_select=golomb mjpeg_decoder jpegls_encoder_select=golomb diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 61fd3a2..8331c45 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -63,6 +63,7 @@ OBJS-$(CONFIG_IDCTDSP) += idctdsp.o simple_idct.o jrevdct.o OBJS-$(CONFIG_IIRFILTER) += iirfilter.o OBJS-$(CONFIG_IMDCT15) += imdct15.o OBJS-$(CONFIG_INTRAX8) += intrax8.o intrax8dsp.o +OBJS-$(CONFIG_IVIDSP) += ivi_dsp.o OBJS-$(CONFIG_JPEGTABLES) += jpegtables.o OBJS-$(CONFIG_LIBXVID) += libxvid_rc.o OBJS-$(CONFIG_LPC) += lpc.o @@ -256,8 +257,8 @@ OBJS-$(CONFIG_IFF_ILBM_DECODER)+= iff.o OBJS-$(CONFIG_IMC_DECODER) += imc.o OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.o OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.o -OBJS-$(CONFIG_INDEO4_DECODER) += indeo4.o ivi.o ivi_dsp.o -OBJS-$(CONFIG_INDEO5_DECODER) += indeo5.o ivi.o ivi_dsp.o +OBJS-$(CONFIG_INDEO4_DECODER) += indeo4.o ivi.o +OBJS-$(CONFIG_INDEO5_DECODER) += indeo5.o ivi.o OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o OBJS-$(CONFIG_JPEG2000_DECODER)+= jpeg2000dec.o jpeg2000.o jpeg2000dsp.o \ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: Factor out mss34dsp module
ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Thu
Jul 16 16:10:59 2015 +0100| [575ec60e542114b2ef5b2f88b28eeb72389dda45] |
committer: Vittorio Giovara
configure: Factor out mss34dsp module
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=575ec60e542114b2ef5b2f88b28eeb72389dda45
---
configure |3 +++
libavcodec/Makefile |5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 8de84df..ce4e6cc 100755
--- a/configure
+++ b/configure
@@ -1618,6 +1618,7 @@ CONFIG_EXTRA=
mpegaudiodsp
mpegvideo
mpegvideoenc
+mss34dsp
pixblockdsp
qpeldsp
qsv
@@ -1918,12 +1919,14 @@ mpeg2_qsv_encoder_deps=libmfx
mpeg2_qsv_encoder_select=qsvenc
mpeg4_decoder_select=h263_decoder mpeg4video_parser
mpeg4_encoder_select=h263_encoder
+msa1_decoder_select=mss34dsp
msmpeg4v1_decoder_select=h263_decoder
msmpeg4v2_decoder_select=h263_decoder
msmpeg4v2_encoder_select=h263_encoder
msmpeg4v3_decoder_select=h263_decoder
msmpeg4v3_encoder_select=h263_encoder
mss2_decoder_select=error_resilience mpeg_er qpeldsp vc1_decoder
+mts2_decoder_select=mss34dsp
mxpeg_decoder_select=mjpeg_decoder
nellymoser_decoder_select=mdct sinewin
nellymoser_encoder_select=audio_frame_queue mdct sinewin
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 8331c45..a484b4e 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -83,6 +83,7 @@ OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o
mpegvideodsp.o rl.o \
OBJS-$(CONFIG_MPEGVIDEOENC)+= mpegvideo_enc.o mpeg12data.o \
motion_est.o ratecontrol.o\
mpegvideoencdsp.o
+OBJS-$(CONFIG_MSS34DSP)+= mss34dsp.o
OBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o
OBJS-${CONFIG_NVENC} += nvenc.o
OBJS-$(CONFIG_QPELDSP) += qpeldsp.o
@@ -310,12 +311,12 @@ OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4enc.o
msmpeg4.o msmpeg4data.o
OBJS-$(CONFIG_MSMPEG4V3_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o
OBJS-$(CONFIG_MSMPEG4V3_ENCODER) += msmpeg4enc.o msmpeg4.o msmpeg4data.o
OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o msrledec.o
-OBJS-$(CONFIG_MSA1_DECODER)+= mss3.o mss34dsp.o
+OBJS-$(CONFIG_MSA1_DECODER)+= mss3.o
OBJS-$(CONFIG_MSS1_DECODER)+= mss1.o mss12.o
OBJS-$(CONFIG_MSS2_DECODER)+= mss2.o mss12.o mss2dsp.o
OBJS-$(CONFIG_MSVIDEO1_DECODER)+= msvideo1.o
OBJS-$(CONFIG_MSZH_DECODER)+= lcldec.o
-OBJS-$(CONFIG_MTS2_DECODER)+= mss4.o mss34dsp.o
+OBJS-$(CONFIG_MTS2_DECODER)+= mss4.o
OBJS-$(CONFIG_MVC1_DECODER)+= mvcdec.o
OBJS-$(CONFIG_MVC2_DECODER)+= mvcdec.o
OBJS-$(CONFIG_MXPEG_DECODER) += mxpegdec.o
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '575ec60e542114b2ef5b2f88b28eeb72389dda45'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri Jul 17 21:59:45 2015 +0200| [77cd5193a5a5f745769123466b13aa52481436a2] | committer: Michael Niedermayer Merge commit '575ec60e542114b2ef5b2f88b28eeb72389dda45' * commit '575ec60e542114b2ef5b2f88b28eeb72389dda45': configure: Factor out mss34dsp module Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77cd5193a5a5f745769123466b13aa52481436a2 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: Factor out g722dsp module
ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Thu Jul 16 16:11:04 2015 +0100| [f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09] | committer: Vittorio Giovara configure: Factor out g722dsp module http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09 --- configure |3 +++ libavcodec/arm/Makefile |6 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 0ed1193..16bf852 100755 --- a/configure +++ b/configure @@ -1590,6 +1590,7 @@ CONFIG_EXTRA= fdctdsp flacdsp fmtconvert +g722dsp gcrypt gmp golomb @@ -1807,6 +1808,8 @@ aac_latm_decoder_select=aac_decoder aac_latm_parser ac3_decoder_select=ac3_parser ac3dsp bswapdsp fmtconvert mdct ac3_encoder_select=ac3dsp audiodsp mdct me_cmp ac3_fixed_encoder_select=ac3dsp audiodsp mdct me_cmp +adpcm_g722_decoder_select=g722dsp +adpcm_g722_encoder_select=g722dsp aic_decoder_select=golomb idctdsp alac_encoder_select=lpc als_decoder_select=bswapdsp diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index c692717..71e55a9 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -20,6 +20,7 @@ OBJS-$(CONFIG_IDCTDSP) += arm/idctdsp_init_arm.o\ arm/simple_idct_arm.o OBJS-$(CONFIG_FLACDSP) += arm/flacdsp_init_arm.o\ arm/flacdsp_arm.o +OBJS-$(CONFIG_G722DSP) += arm/g722dsp_init_arm.o OBJS-$(CONFIG_ME_CMP) += arm/me_cmp_init_arm.o OBJS-$(CONFIG_MPEGAUDIODSP)+= arm/mpegaudiodsp_init_arm.o OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_arm.o @@ -36,8 +37,6 @@ OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_init_arm.o \ arm/sbrdsp_init_arm.o OBJS-$(CONFIG_APE_DECODER) += arm/apedsp_init_arm.o OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_init_arm.o -OBJS-$(CONFIG_ADPCM_G722_DECODER) += arm/g722dsp_init_arm.o -OBJS-$(CONFIG_ADPCM_G722_ENCODER) += arm/g722dsp_init_arm.o OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_init_arm.o OBJS-$(CONFIG_RV40_DECODER)+= arm/rv40dsp_init_arm.o OBJS-$(CONFIG_VC1_DECODER) += arm/vc1dsp_init_arm.o @@ -103,6 +102,7 @@ NEON-OBJS-$(CONFIG_BLOCKDSP) += arm/blockdsp_init_neon.o \ NEON-OBJS-$(CONFIG_FFT)+= arm/fft_neon.o\ arm/fft_fixed_neon.o NEON-OBJS-$(CONFIG_FMTCONVERT) += arm/fmtconvert_neon.o +NEON-OBJS-$(CONFIG_G722DSP)+= arm/g722dsp_neon.o NEON-OBJS-$(CONFIG_H264CHROMA) += arm/h264cmc_neon.o NEON-OBJS-$(CONFIG_H264DSP)+= arm/h264dsp_neon.o\ arm/h264idct_neon.o @@ -128,8 +128,6 @@ NEON-OBJS-$(CONFIG_AAC_DECODER)+= arm/aacpsdsp_neon.o \ NEON-OBJS-$(CONFIG_APE_DECODER)+= arm/apedsp_neon.o NEON-OBJS-$(CONFIG_DCA_DECODER)+= arm/dcadsp_neon.o \ arm/synth_filter_neon.o -NEON-OBJS-$(CONFIG_ADPCM_G722_DECODER) += arm/g722dsp_neon.o -NEON-OBJS-$(CONFIG_ADPCM_G722_ENCODER) += arm/g722dsp_neon.o NEON-OBJS-$(CONFIG_RV30_DECODER) += arm/rv34dsp_neon.o NEON-OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_neon.o\ arm/rv40dsp_neon.o ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Fri Jul 17 23:04:47 2015 +0200| [c7c33ab721cfafbbe269c8f1505eb2d9a80d7af4] | committer: Michael Niedermayer Merge commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09' * commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09': configure: Factor out g722dsp module Conflicts: configure libavcodec/arm/Makefile Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7c33ab721cfafbbe269c8f1505eb2d9a80d7af4 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit 'fc56868399213d3e9be19bdebeb64df233b39a7e'
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Sat Jul 18 01:56:58 2015 +0200| [b1861f18b6e384f3b5cd071f49b43a2b2e8607e1] | committer: Michael Niedermayer Merge commit 'fc56868399213d3e9be19bdebeb64df233b39a7e' * commit 'fc56868399213d3e9be19bdebeb64df233b39a7e': cosmetics: Reformat checkasm tests Merged-by: Michael Niedermayer mich...@niedermayer.cc http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b1861f18b6e384f3b5cd071f49b43a2b2e8607e1 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
