On 31/03/14 14:01, Vittorio Giovara wrote:
> On Mon, Mar 31, 2014 at 11:08 AM, Kostya Shishkov
> <kostya.shish...@gmail.com> wrote:
>> On Sun, Mar 30, 2014 at 02:01:36PM +0200, Luca Barbato wrote:
>>> From: Peter Ross <pr...@xvid.org>
>>>
>>> Further performance improvements and security fixes by
>>> Vittorio Giovara and Luca Barbato.
>>>
>>> Signed-off-by: Vittorio Giovara <vittorio.giov...@gmail.com>
>>> Signed-off-by: Luca Barbato <lu_z...@gentoo.org>
>>> ---
>>>
>>> Now with the remaining changes from Peter added, thanks for pointing
>>> them.
>>>
>>> Changelog | 1 +
>>> configure | 1 +
>>> doc/general.texi | 2 +
>>> libavcodec/Makefile | 1 +
>>> libavcodec/allcodecs.c | 1 +
>>> libavcodec/arm/h264pred_init_arm.c | 8 +-
>>> libavcodec/arm/vp8dsp.h | 2 +
>>> libavcodec/arm/vp8dsp_init_arm.c | 10 +
>>> libavcodec/arm/vp8dsp_init_armv6.c | 58 +++
>>> libavcodec/arm/vp8dsp_init_neon.c | 56 +++
>>> libavcodec/avcodec.h | 1 +
>>> libavcodec/codec_desc.c | 7 +
>>> libavcodec/h264pred.c | 17 +-
>>> libavcodec/h264pred.h | 2 +-
>>> libavcodec/ppc/vp8dsp_altivec.c | 9 +-
>>> libavcodec/version.h | 2 +-
>>> libavcodec/vp8.c | 829
>>> ++++++++++++++++++++++++++++-------
>>> libavcodec/vp8.h | 21 +
>>> libavcodec/vp8data.h | 151 ++++++-
>>> libavcodec/vp8dsp.c | 385 +++++++++++-----
>>> libavcodec/vp8dsp.h | 7 +
>>> libavcodec/x86/Makefile | 3 +
>>> libavcodec/x86/h264_intrapred_init.c | 11 +-
>>> libavcodec/x86/vp8dsp_init.c | 52 ++-
>>> libavformat/riff.c | 2 +
>>> 25 files changed, 1346 insertions(+), 293 deletions(-)
>>>
>> [...]
>>> diff --git a/libavcodec/ppc/vp8dsp_altivec.c
>>> b/libavcodec/ppc/vp8dsp_altivec.c
>>> index 366dc3c..a260465 100644
>>> --- a/libavcodec/ppc/vp8dsp_altivec.c
>>> +++ b/libavcodec/ppc/vp8dsp_altivec.c
>>> @@ -311,7 +311,9 @@ static void put_vp8_pixels16_altivec(uint8_t *dst,
>>> ptrdiff_t dstride, uint8_t *s
>>>
>>> #endif /* HAVE_ALTIVEC */
>>>
>>> -av_cold void ff_vp8dsp_init_ppc(VP8DSPContext *c)
>>> +
>>> +
>>
>> useless empty lines
>>
>>> +av_cold void ff_vp7dsp_init_ppc(VP8DSPContext *c)
>>> {
>>> #if HAVE_ALTIVEC
>>> if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
>>> @@ -343,3 +345,8 @@ av_cold void ff_vp8dsp_init_ppc(VP8DSPContext *c)
>>> c->put_vp8_epel_pixels_tab[2][2][1] = put_vp8_epel4_h4v6_altivec;
>>> #endif /* HAVE_ALTIVEC */
>>> }
>>> +
>>> +av_cold void ff_vp7dsp_init_ppc(VP8DSPContext *c)
>>> +{
>>> + ff_vp7dsp_init_ppc(c);
>>> +}
>>> diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
>>> index a1d24cd..a2e16aa 100644
>>> --- a/libavcodec/vp8.c
>>> +++ b/libavcodec/vp8.c
>>> @@ -127,7 +152,7 @@ static int update_dimensions(VP8Context *s, int width,
>>> int height)
>>> s->mb_width = (s->avctx->coded_width + 15) / 16;
>>> s->mb_height = (s->avctx->coded_height + 15) / 16;
>>>
>>> - s->mb_layout = (avctx->active_thread_type == FF_THREAD_SLICE) &&
>>> + s->mb_layout = is_vp7 || (avctx->active_thread_type ==
>>> FF_THREAD_SLICE) &&
>>> (FFMIN(s->num_coeff_partitions, avctx->thread_count) >
>>> 1);
>>
>> suspicious parentheses placement
>>
>>> if (!s->mb_layout) { // Frame threading and one thread
>>> s->macroblocks_base = av_mallocz((s->mb_width + s->mb_height
>>> * 2 + 1) *
>> [...]
>>
>> the rest LGTM
>
> Amended locally, also added some documentation.
> If no objections I'd push this later today.
Let me test it in 3 hours.
lu
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
