June 2016 - ffmpeg-cvslog - lists.ffmpeg.org

avformat/avformat: Move new field to the end of AVStream
by git＠videolan.org 30 Jun '16

30 Jun '16

ffmpeg | branch: release/3.1 | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Jun 30 14:02:26 2016 +0200| [f617b94c233fb070810c03478968c3e036787564] | committer: Michael Niedermayer avformat/avformat: Move new field to the end of AVStream This fixes part of Ticket5676 This fixes kodi, mpv, chromium and ffplay build against 3.0 and linked to 3.1 This is a similar ABI fix to 1eb43af1a0e542ad83dcbf327197785d815fc42d Approved-by: BBB Approved-by: jamrial Approved-by: BtbN Approved-by: nevcairiel Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit c1c7e0abb0c513a5f35b29126175b99fc9ca0254) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f617b94c233fb0708… --- libavformat/avformat.h | 22 +++++++++++----------- libavformat/version.h | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 876f1e3..818184e 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -985,17 +985,6 @@ typedef struct AVStream { int event_flags; #define AVSTREAM_EVENT_FLAG_METADATA_UPDATED 0x0001 ///< The call resulted in updated metadata. - /* - * Codec parameters associated with this stream. Allocated and freed by - * libavformat in avformat_new_stream() and avformat_free_context() - * respectively. - * - * - demuxing: filled by libavformat on stream creation or in - * avformat_find_stream_info() - * - muxing: filled by the caller before avformat_write_header() - */ - AVCodecParameters *codecpar; - /***************************************************************** * All fields below this line are not part of the public API. They * may not be used outside of libavformat and can be changed and @@ -1217,6 +1206,17 @@ typedef struct AVStream { * Must not be accessed in any way by callers. */ AVStreamInternal *internal; + + /* + * Codec parameters associated with this stream. Allocated and freed by + * libavformat in avformat_new_stream() and avformat_free_context() + * respectively. + * + * - demuxing: filled by libavformat on stream creation or in + * avformat_find_stream_info() + * - muxing: filled by the caller before avformat_write_header() + */ + AVCodecParameters *codecpar; } AVStream; AVRational av_stream_get_r_frame_rate(const AVStream *s); diff --git a/libavformat/version.h b/libavformat/version.h index 544d436..47a8afb 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,8 +32,8 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you belive might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 40 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MINOR 41 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \

1 0

avformat/utils: update deprecated AVStream-> codec when the context is updated
by git＠videolan.org 30 Jun '16

30 Jun '16

ffmpeg | branch: release/3.1 | Hendrik Leppkes <h.leppkes(a)gmail.com> | Thu Jun 30 14:10:42 2016 +0200| [79af094b9304676a2bd83a5172fac97f0d964c1a] | committer: Michael Niedermayer avformat/utils: update deprecated AVStream->codec when the context is updated This ensures the AVStream->codec entry is kept in sync when new streams are discovered mid-playback or changes to the context occur from other sources. Fixes trac 5678. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit c2e13d2ecd388bab28e743c34ed146c5ed213fc9) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=79af094b9304676a2… --- libavformat/utils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index 6f343f2..d2a709c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1483,6 +1483,15 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) if (ret < 0) return ret; +#if FF_API_LAVF_AVCTX +FF_DISABLE_DEPRECATION_WARNINGS + /* update deprecated public codec context */ + ret = avcodec_parameters_to_context(st->codec, st->codecpar); + if (ret < 0) + return ret; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + st->internal->need_context_update = 0; }

1 0

avutil/frame: Move new field to the end of AVFrame
by git＠videolan.org 30 Jun '16

30 Jun '16

ffmpeg | branch: release/3.1 | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Jun 30 14:02:27 2016 +0200| [77473002898f1dce18761c8a9bca48a8fe888d2e] | committer: Michael Niedermayer avutil/frame: Move new field to the end of AVFrame This fixes part of Ticket5676 This fixes kodi, mpv, chromium and ffplay build against 3.0 and linked to 3.1 This is a similar ABI fix to 1eb43af1a0e542ad83dcbf327197785d815fc42d Approved-by: BBB Approved-by: jamrial Approved-by: BtbN Approved-by: nevcairiel Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 042fb69deb5303d147b21ab1061387fb6e0c7afc) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77473002898f1dce1… --- libavutil/frame.h | 11 +++++------ libavutil/version.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libavutil/frame.h b/libavutil/frame.h index 44adec4..2b5c332 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -428,12 +428,6 @@ typedef struct AVFrame { enum AVChromaLocation chroma_location; /** - * For hwaccel-format frames, this should be a reference to the - * AVHWFramesContext describing the frame. - */ - AVBufferRef *hw_frames_ctx; - - /** * frame timestamp estimated using various heuristics, in stream time base * Code outside libavutil should access this field using: * av_frame_get_best_effort_timestamp(frame) @@ -524,6 +518,11 @@ typedef struct AVFrame { */ AVBufferRef *qp_table_buf; #endif + /** + * For hwaccel-format frames, this should be a reference to the + * AVHWFramesContext describing the frame. + */ + AVBufferRef *hw_frames_ctx; } AVFrame; /** diff --git a/libavutil/version.h b/libavutil/version.h index aa10622..07618fc 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -64,7 +64,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 27 +#define LIBAVUTIL_VERSION_MINOR 28 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

1 0

libavcodec/exr : fix decoding piz float file.
by git＠videolan.org 30 Jun '16

30 Jun '16

ffmpeg | branch: release/3.1 | Martin Vignali <martin.vignali(a)gmail.com> | Tue Jun 28 13:23:43 2016 +0200| [37c83b53730aed3205dab3055aefffa642763ea4] | committer: Michael Niedermayer libavcodec/exr : fix decoding piz float file. fix ticket #5674 the size of data to process in piz_uncompress, is now calc using the pixel type of each channel. the data reorganization, alos take care about the size of each channel Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit d9e1e08133234dc4501413f0e3211f3a268049bc) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37c83b53730aed320… --- libavcodec/exr.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index c87187c..cabe329 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -749,6 +749,9 @@ static int piz_uncompress(EXRContext *s, const uint8_t *src, int ssize, uint16_t *tmp = (uint16_t *)td->tmp; uint8_t *out; int ret, i, j; + int pixel_half_size;/* 1 for half, 2 for float and uint32 */ + EXRChannel *channel; + int tmp_offset; if (!td->bitmap) td->bitmap = av_malloc(BITMAP_SIZE); @@ -781,24 +784,38 @@ static int piz_uncompress(EXRContext *s, const uint8_t *src, int ssize, ptr = tmp; for (i = 0; i < s->nb_channels; i++) { - EXRChannel *channel = &s->channels[i]; - int size = channel->pixel_type; + channel = &s->channels[i]; - for (j = 0; j < size; j++) - wav_decode(ptr + j, td->xsize, size, td->ysize, - td->xsize * size, maxval); - ptr += td->xsize * td->ysize * size; + if (channel->pixel_type == EXR_HALF) + pixel_half_size = 1; + else + pixel_half_size = 2; + + for (j = 0; j < pixel_half_size; j++) + wav_decode(ptr + j, td->xsize, pixel_half_size, td->ysize, + td->xsize * pixel_half_size, maxval); + ptr += td->xsize * td->ysize * pixel_half_size; } apply_lut(td->lut, tmp, dsize / sizeof(uint16_t)); out = td->uncompressed_data; - for (i = 0; i < td->ysize; i++) + for (i = 0; i < td->ysize; i++) { + tmp_offset = 0; for (j = 0; j < s->nb_channels; j++) { - uint16_t *in = tmp + j * td->xsize * td->ysize + i * td->xsize; - memcpy(out, in, td->xsize * 2); - out += td->xsize * 2; + uint16_t *in; + EXRChannel *channel = &s->channels[j]; + if (channel->pixel_type == EXR_HALF) + pixel_half_size = 1; + else + pixel_half_size = 2; + + in = tmp + tmp_offset * td->xsize * td->ysize + i * td->xsize * pixel_half_size; + tmp_offset += pixel_half_size; + memcpy(out, in, td->xsize * 2 * pixel_half_size); + out += td->xsize * 2 * pixel_half_size; } + } return 0; }

1 0

avformat/avformat: Move new field to the end of AVStream
by git＠videolan.org 30 Jun '16

30 Jun '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Jun 30 14:02:26 2016 +0200| [c1c7e0abb0c513a5f35b29126175b99fc9ca0254] | committer: Michael Niedermayer avformat/avformat: Move new field to the end of AVStream This fixes part of Ticket5676 This fixes kodi, mpv, chromium and ffplay build against 3.0 and linked to 3.1 This is a similar ABI fix to 1eb43af1a0e542ad83dcbf327197785d815fc42d Approved-by: BBB Approved-by: jamrial Approved-by: BtbN Approved-by: nevcairiel Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1c7e0abb0c513a5f… --- libavformat/avformat.h | 22 +++++++++++----------- libavformat/version.h | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 876f1e3..818184e 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -985,17 +985,6 @@ typedef struct AVStream { int event_flags; #define AVSTREAM_EVENT_FLAG_METADATA_UPDATED 0x0001 ///< The call resulted in updated metadata. - /* - * Codec parameters associated with this stream. Allocated and freed by - * libavformat in avformat_new_stream() and avformat_free_context() - * respectively. - * - * - demuxing: filled by libavformat on stream creation or in - * avformat_find_stream_info() - * - muxing: filled by the caller before avformat_write_header() - */ - AVCodecParameters *codecpar; - /***************************************************************** * All fields below this line are not part of the public API. They * may not be used outside of libavformat and can be changed and @@ -1217,6 +1206,17 @@ typedef struct AVStream { * Must not be accessed in any way by callers. */ AVStreamInternal *internal; + + /* + * Codec parameters associated with this stream. Allocated and freed by + * libavformat in avformat_new_stream() and avformat_free_context() + * respectively. + * + * - demuxing: filled by libavformat on stream creation or in + * avformat_find_stream_info() + * - muxing: filled by the caller before avformat_write_header() + */ + AVCodecParameters *codecpar; } AVStream; AVRational av_stream_get_r_frame_rate(const AVStream *s); diff --git a/libavformat/version.h b/libavformat/version.h index 544d436..47a8afb 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,8 +32,8 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you belive might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 40 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MINOR 41 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \

1 0

avformat/utils: update deprecated AVStream-> codec when the context is updated
by git＠videolan.org 30 Jun '16

30 Jun '16

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Thu Jun 30 14:10:42 2016 +0200| [c2e13d2ecd388bab28e743c34ed146c5ed213fc9] | committer: Michael Niedermayer avformat/utils: update deprecated AVStream->codec when the context is updated This ensures the AVStream->codec entry is kept in sync when new streams are discovered mid-playback or changes to the context occur from other sources. Fixes trac 5678. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2e13d2ecd388bab2… --- libavformat/utils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index 6f343f2..d2a709c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1483,6 +1483,15 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) if (ret < 0) return ret; +#if FF_API_LAVF_AVCTX +FF_DISABLE_DEPRECATION_WARNINGS + /* update deprecated public codec context */ + ret = avcodec_parameters_to_context(st->codec, st->codecpar); + if (ret < 0) + return ret; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + st->internal->need_context_update = 0; }

1 0

avutil/frame: Move new field to the end of AVFrame
by git＠videolan.org 30 Jun '16

30 Jun '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Jun 30 14:02:27 2016 +0200| [042fb69deb5303d147b21ab1061387fb6e0c7afc] | committer: Michael Niedermayer avutil/frame: Move new field to the end of AVFrame This fixes part of Ticket5676 This fixes kodi, mpv, chromium and ffplay build against 3.0 and linked to 3.1 This is a similar ABI fix to 1eb43af1a0e542ad83dcbf327197785d815fc42d Approved-by: BBB Approved-by: jamrial Approved-by: BtbN Approved-by: nevcairiel Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=042fb69deb5303d14… --- libavutil/frame.h | 11 +++++------ libavutil/version.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libavutil/frame.h b/libavutil/frame.h index 44adec4..2b5c332 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -428,12 +428,6 @@ typedef struct AVFrame { enum AVChromaLocation chroma_location; /** - * For hwaccel-format frames, this should be a reference to the - * AVHWFramesContext describing the frame. - */ - AVBufferRef *hw_frames_ctx; - - /** * frame timestamp estimated using various heuristics, in stream time base * Code outside libavutil should access this field using: * av_frame_get_best_effort_timestamp(frame) @@ -524,6 +518,11 @@ typedef struct AVFrame { */ AVBufferRef *qp_table_buf; #endif + /** + * For hwaccel-format frames, this should be a reference to the + * AVHWFramesContext describing the frame. + */ + AVBufferRef *hw_frames_ctx; } AVFrame; /** diff --git a/libavutil/version.h b/libavutil/version.h index aa10622..07618fc 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -64,7 +64,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 27 +#define LIBAVUTIL_VERSION_MINOR 28 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

1 0

libavcodec/exr : fix decoding piz float file.
by git＠videolan.org 30 Jun '16

30 Jun '16

ffmpeg | branch: master | Martin Vignali <martin.vignali(a)gmail.com> | Tue Jun 28 13:23:43 2016 +0200| [d9e1e08133234dc4501413f0e3211f3a268049bc] | committer: Michael Niedermayer libavcodec/exr : fix decoding piz float file. fix ticket #5674 the size of data to process in piz_uncompress, is now calc using the pixel type of each channel. the data reorganization, alos take care about the size of each channel Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d9e1e08133234dc45… --- libavcodec/exr.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index c87187c..cabe329 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -749,6 +749,9 @@ static int piz_uncompress(EXRContext *s, const uint8_t *src, int ssize, uint16_t *tmp = (uint16_t *)td->tmp; uint8_t *out; int ret, i, j; + int pixel_half_size;/* 1 for half, 2 for float and uint32 */ + EXRChannel *channel; + int tmp_offset; if (!td->bitmap) td->bitmap = av_malloc(BITMAP_SIZE); @@ -781,24 +784,38 @@ static int piz_uncompress(EXRContext *s, const uint8_t *src, int ssize, ptr = tmp; for (i = 0; i < s->nb_channels; i++) { - EXRChannel *channel = &s->channels[i]; - int size = channel->pixel_type; + channel = &s->channels[i]; - for (j = 0; j < size; j++) - wav_decode(ptr + j, td->xsize, size, td->ysize, - td->xsize * size, maxval); - ptr += td->xsize * td->ysize * size; + if (channel->pixel_type == EXR_HALF) + pixel_half_size = 1; + else + pixel_half_size = 2; + + for (j = 0; j < pixel_half_size; j++) + wav_decode(ptr + j, td->xsize, pixel_half_size, td->ysize, + td->xsize * pixel_half_size, maxval); + ptr += td->xsize * td->ysize * pixel_half_size; } apply_lut(td->lut, tmp, dsize / sizeof(uint16_t)); out = td->uncompressed_data; - for (i = 0; i < td->ysize; i++) + for (i = 0; i < td->ysize; i++) { + tmp_offset = 0; for (j = 0; j < s->nb_channels; j++) { - uint16_t *in = tmp + j * td->xsize * td->ysize + i * td->xsize; - memcpy(out, in, td->xsize * 2); - out += td->xsize * 2; + uint16_t *in; + EXRChannel *channel = &s->channels[j]; + if (channel->pixel_type == EXR_HALF) + pixel_half_size = 1; + else + pixel_half_size = 2; + + in = tmp + tmp_offset * td->xsize * td->ysize + i * td->xsize * pixel_half_size; + tmp_offset += pixel_half_size; + memcpy(out, in, td->xsize * 2 * pixel_half_size); + out += td->xsize * 2 * pixel_half_size; } + } return 0; }

1 0

PPC64: Add versions of functions in libswscale/ input.c optimized for POWER8 VSX SIMD.
by git＠videolan.org 30 Jun '16

30 Jun '16

ffmpeg | branch: master | Dan Parrot <dan.parrot(a)mail.com> | Wed Jun 29 16:15:12 2016 +0000| [1df908f33f658979b32599489ca6f1a39821013c] | committer: Michael Niedermayer PPC64: Add versions of functions in libswscale/input.c optimized for POWER8 VSX SIMD. This patch addresses Trac ticket #5570. The optimized functions are in file libswscale/ppc/input_vsx.c. Each optimized function name is a concatenation of the corresponding name in libswscale/input.c with suffix _vsx. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1df908f33f658979b… --- libswscale/ppc/Makefile | 1 + libswscale/ppc/input_vsx.c | 437 +++++++++++++++++++++++++++++++++++++++++ libswscale/swscale.c | 3 + libswscale/swscale_internal.h | 1 + 4 files changed, 442 insertions(+) diff --git a/libswscale/ppc/Makefile b/libswscale/ppc/Makefile index d1b596e..2482893 100644 --- a/libswscale/ppc/Makefile +++ b/libswscale/ppc/Makefile @@ -1,3 +1,4 @@ OBJS += ppc/swscale_altivec.o \ + ppc/input_vsx.o \ ppc/yuv2rgb_altivec.o \ ppc/yuv2yuv_altivec.o \ diff --git a/libswscale/ppc/input_vsx.c b/libswscale/ppc/input_vsx.c new file mode 100644 index 0000000..d977a32 --- /dev/null +++ b/libswscale/ppc/input_vsx.c @@ -0,0 +1,437 @@ +/* + * Copyright (C) 2016 Dan Parrot <dan.parrot(a)mail.com> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <math.h> +#include <stdint.h> +#include <stdio.h> +#include <string.h> + +#include "libavutil/avutil.h" +#include "libavutil/bswap.h" +#include "libavutil/cpu.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/mathematics.h" +#include "libavutil/pixdesc.h" +#include "libavutil/avassert.h" +#include "config.h" +#include "libswscale/rgb2rgb.h" +#include "libswscale/swscale.h" +#include "libswscale/swscale_internal.h" + +#if HAVE_VSX + +static void abgrToA_c_vsx(uint8_t *_dst, const uint8_t *src, const uint8_t *unused1, const uint8_t *unused2, + int width, uint32_t *unused) +{ + int16_t *dst = (int16_t *)_dst; + int i, width_adj, frag_len; + + uintptr_t src_addr = (uintptr_t)src; + uintptr_t dst_addr = (uintptr_t)dst; + + // compute integral number of vector-length items and length of final fragment + width_adj = width >> 3; + width_adj = width_adj << 3; + frag_len = width - width_adj; + + for ( i = 0; i < width_adj; i += 8) { + vector int v_rd0 = vec_vsx_ld(0, (int *)src_addr); + vector int v_rd1 = vec_vsx_ld(0, (int *)(src_addr + 16)); + + v_rd0 = vec_and(v_rd0, vec_splats(0x0ff)); + v_rd1 = vec_and(v_rd1, vec_splats(0x0ff)); + + v_rd0 = vec_sl(v_rd0, vec_splats((unsigned)6)); + v_rd1 = vec_sl(v_rd1, vec_splats((unsigned)6)); + + vector int v_dst = vec_perm(v_rd0, v_rd1, ((vector unsigned char) + {0, 1, 4, 5, 8, 9, 12, 13, 16, 17, 20, 21, 24, 25, 28, 29})); + vec_vsx_st((vector unsigned char)v_dst, 0, (unsigned char *)dst_addr); + + src_addr += 32; + dst_addr += 16; + } + + for (i=width_adj; i< width_adj + frag_len; i++) { + dst[i]= src[4*i]<<6; + } +} + +static void rgbaToA_c_vsx(uint8_t *_dst, const uint8_t *src, const uint8_t *unused1, const uint8_t *unused2, + int width, uint32_t *unused) +{ + int16_t *dst = (int16_t *)_dst; + int i, width_adj, frag_len; + + uintptr_t src_addr = (uintptr_t)src; + uintptr_t dst_addr = (uintptr_t)dst; + + // compute integral number of vector-length items and length of final fragment + width_adj = width >> 3; + width_adj = width_adj << 3; + frag_len = width - width_adj; + + for ( i = 0; i < width_adj; i += 8) { + vector int v_rd0 = vec_vsx_ld(0, (int *)src_addr); + vector int v_rd1 = vec_vsx_ld(0, (int *)(src_addr + 16)); + + v_rd0 = vec_sld(v_rd0, v_rd0, 13); + v_rd1 = vec_sld(v_rd1, v_rd1, 13); + + v_rd0 = vec_and(v_rd0, vec_splats(0x0ff)); + v_rd1 = vec_and(v_rd1, vec_splats(0x0ff)); + + v_rd0 = vec_sl(v_rd0, vec_splats((unsigned)6)); + v_rd1 = vec_sl(v_rd1, vec_splats((unsigned)6)); + + vector int v_dst = vec_perm(v_rd0, v_rd1, ((vector unsigned char) + {0, 1, 4, 5, 8, 9, 12, 13, 16, 17, 20, 21, 24, 25, 28, 29})); + vec_vsx_st((vector unsigned char)v_dst, 0, (unsigned char *)dst_addr); + + src_addr += 32; + dst_addr += 16; + } + + for (i=width_adj; i< width_adj + frag_len; i++) { + dst[i]= src[4*i+3]<<6; + } +} + +static void yuy2ToY_c_vsx(uint8_t *dst, const uint8_t *src, const uint8_t *unused1, const uint8_t *unused2, int width, + uint32_t *unused) +{ + int i, width_adj, frag_len; + + uintptr_t src_addr = (uintptr_t)src; + uintptr_t dst_addr = (uintptr_t)dst; + + // compute integral number of vector-length items and length of final fragment + width_adj = width >> 4; + width_adj = width_adj << 4; + frag_len = width - width_adj; + + for ( i = 0; i < width_adj; i += 16) { + vector unsigned char v_rd0 = vec_vsx_ld(0, (unsigned char *)src_addr); + vector unsigned char v_rd1 = vec_vsx_ld(0, (unsigned char *)(src_addr + 16)); + + vector unsigned char v_dst = vec_perm(v_rd0, v_rd1, ((vector unsigned char) + {0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30})); + vec_vsx_st((vector unsigned char)v_dst, 0, (unsigned char *)dst_addr); + + src_addr += 32; + dst_addr += 16; + } + + for (i=width_adj; i< width_adj + frag_len; i++) { + dst[i] = src[2 * i]; + } +} + +static void yuy2ToUV_c_vsx(uint8_t *dstU, uint8_t *dstV, const uint8_t *unused0, const uint8_t *src1, + const uint8_t *src2, int width, uint32_t *unused) +{ + int i, width_adj, frag_len; + + uintptr_t src1_addr = (uintptr_t)src1; + uintptr_t dstu_addr = (uintptr_t)dstU; + uintptr_t dstv_addr = (uintptr_t)dstV; + + // compute integral number of vector-length items and length of final fragment + width_adj = width >> 4; + width_adj = width_adj << 4; + frag_len = width - width_adj; + + for ( i = 0; i < width_adj; i += 16) { + vector unsigned char v_src1_0 = vec_vsx_ld(0, (unsigned char *)src1_addr); + vector unsigned char v_src1_1 = vec_vsx_ld(0, (unsigned char *)(src1_addr + 16)); + vector unsigned char v_src1_2 = vec_vsx_ld(0, (unsigned char *)(src1_addr + 32)); + vector unsigned char v_src1_3 = vec_vsx_ld(0, (unsigned char *)(src1_addr + 48)); + + vector unsigned char v_dstu = vec_perm(v_src1_0, v_src1_1, + ((vector unsigned char) + {1, 5, 9, 13, 17, 21, 25, 29, 1, 5, 9, 13, 17, 21, 25, 29})); + vector unsigned char v_dstv = vec_perm(v_src1_0, v_src1_1, + ((vector unsigned char) + {3, 7, 11, 15, 19, 23, 27, 31, 1, 5, 9, 13, 17, 21, 25, 29})); + + v_dstu = vec_perm(v_dstu, v_src1_2,((vector unsigned char) + {0, 1, 2, 3, 4, 5, 6, 7, 17, 21, 25, 29, 17, 21, 25, 29})); + v_dstv = vec_perm(v_dstv, v_src1_2,((vector unsigned char) + {0, 1, 2, 3, 4, 5, 6, 7, 19, 23, 27, 31, 17, 21, 25, 29})); + + v_dstu = vec_perm(v_dstu, v_src1_3,((vector unsigned char) + {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 17, 21, 25, 29})); + v_dstv = vec_perm(v_dstv, v_src1_3,((vector unsigned char) + {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 19, 23, 27, 31})); + + vec_vsx_st((vector unsigned char)v_dstu, 0, (unsigned char *)dstu_addr); + vec_vsx_st((vector unsigned char)v_dstv, 0, (unsigned char *)dstv_addr); + + src1_addr += 64; + dstu_addr += 16; + dstv_addr += 16; + } + + for (i=width_adj; i< width_adj + frag_len; i++) { + dstU[i] = src1[4 * i + 1]; + dstV[i] = src1[4 * i + 3]; + } + av_assert1(src1 == src2); +} + +static void yvy2ToUV_c_vsx(uint8_t *dstU, uint8_t *dstV, const uint8_t *unused0, const uint8_t *src1, + const uint8_t *src2, int width, uint32_t *unused) +{ + int i, width_adj, frag_len; + + uintptr_t src1_addr = (uintptr_t)src1; + uintptr_t dstu_addr = (uintptr_t)dstU; + uintptr_t dstv_addr = (uintptr_t)dstV; + + // compute integral number of vector-length items and length of final fragment + width_adj = width >> 4; + width_adj = width_adj << 4; + frag_len = width - width_adj; + + for ( i = 0; i < width_adj; i += 16) { + vector unsigned char v_src1_0 = vec_vsx_ld(0, (unsigned char *)src1_addr); + vector unsigned char v_src1_1 = vec_vsx_ld(0, (unsigned char *)(src1_addr + 16)); + vector unsigned char v_src1_2 = vec_vsx_ld(0, (unsigned char *)(src1_addr + 32)); + vector unsigned char v_src1_3 = vec_vsx_ld(0, (unsigned char *)(src1_addr + 48)); + + vector unsigned char v_dstv = vec_perm(v_src1_0, v_src1_1, + ((vector unsigned char) + {1, 5, 9, 13, 17, 21, 25, 29, 1, 5, 9, 13, 17, 21, 25, 29})); + vector unsigned char v_dstu = vec_perm(v_src1_0, v_src1_1, + ((vector unsigned char) + {3, 7, 11, 15, 19, 23, 27, 31, 1, 5, 9, 13, 17, 21, 25, 29})); + + v_dstv = vec_perm(v_dstv, v_src1_2,((vector unsigned char) + {0, 1, 2, 3, 4, 5, 6, 7, 17, 21, 25, 29, 17, 21, 25, 29})); + v_dstu = vec_perm(v_dstu, v_src1_2,((vector unsigned char) + {0, 1, 2, 3, 4, 5, 6, 7, 19, 23, 27, 31, 17, 21, 25, 29})); + + v_dstv = vec_perm(v_dstv, v_src1_3,((vector unsigned char) + {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 17, 21, 25, 29})); + v_dstu = vec_perm(v_dstu, v_src1_3,((vector unsigned char) + {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 19, 23, 27, 31})); + + vec_vsx_st((vector unsigned char)v_dstu, 0, (unsigned char *)dstu_addr); + vec_vsx_st((vector unsigned char)v_dstv, 0, (unsigned char *)dstv_addr); + + src1_addr += 64; + dstu_addr += 16; + dstv_addr += 16; + } + + for (i=width_adj; i< width_adj + frag_len; i++) { + dstV[i] = src1[4 * i + 1]; + dstU[i] = src1[4 * i + 3]; + } + av_assert1(src1 == src2); +} + +static void uyvyToY_c_vsx(uint8_t *dst, const uint8_t *src, const uint8_t *unused1, const uint8_t *unused2, int width, + uint32_t *unused) +{ + int i, width_adj, frag_len; + + uintptr_t src_addr = (uintptr_t)src; + uintptr_t dst_addr = (uintptr_t)dst; + + // compute integral number of vector-length items and length of final fragment + width_adj = width >> 4; + width_adj = width_adj << 4; + frag_len = width - width_adj; + + for ( i = 0; i < width_adj; i += 16) { + vector unsigned char v_rd0 = vec_vsx_ld(0, (unsigned char *)src_addr); + vector unsigned char v_rd1 = vec_vsx_ld(0, (unsigned char *)(src_addr + 16)); + + vector unsigned char v_dst = vec_perm(v_rd0, v_rd1, ((vector unsigned char) + {1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31})); + vec_vsx_st((vector unsigned char)v_dst, 0, (unsigned char *)dst_addr); + + src_addr += 32; + dst_addr += 16; + } + + for (i=width_adj; i< width_adj + frag_len; i++) { + dst[i] = src[2 * i + 1]; + } +} + +static void uyvyToUV_c_vsx(uint8_t *dstU, uint8_t *dstV, const uint8_t *unused0, const uint8_t *src1, + const uint8_t *src2, int width, uint32_t *unused) +{ + int i, width_adj, frag_len; + + uintptr_t src1_addr = (uintptr_t)src1; + uintptr_t dstu_addr = (uintptr_t)dstU; + uintptr_t dstv_addr = (uintptr_t)dstV; + + // compute integral number of vector-length items and length of final fragment + width_adj = width >> 4; + width_adj = width_adj << 4; + frag_len = width - width_adj; + + for ( i = 0; i < width_adj; i += 16) { + vector unsigned char v_src1_0 = vec_vsx_ld(0, (unsigned char *)src1_addr); + vector unsigned char v_src1_1 = vec_vsx_ld(0, (unsigned char *)(src1_addr + 16)); + vector unsigned char v_src1_2 = vec_vsx_ld(0, (unsigned char *)(src1_addr + 32)); + vector unsigned char v_src1_3 = vec_vsx_ld(0, (unsigned char *)(src1_addr + 48)); + + vector unsigned char v_dstu = vec_perm(v_src1_0, v_src1_1, + ((vector unsigned char) + {0, 4, 8, 12, 16, 20, 24, 28, 1, 5, 9, 13, 17, 21, 25, 29})); + vector unsigned char v_dstv = vec_perm(v_src1_0, v_src1_1, + ((vector unsigned char) + {2, 6, 10, 14, 18, 22, 26, 30, 1, 5, 9, 13, 17, 21, 25, 29})); + + v_dstu = vec_perm(v_dstu, v_src1_2,((vector unsigned char) + {0, 1, 2, 3, 4, 5, 6, 7, 16, 20, 24, 28, 17, 21, 25, 29})); + v_dstv = vec_perm(v_dstv, v_src1_2,((vector unsigned char) + {0, 1, 2, 3, 4, 5, 6, 7, 18, 22, 26, 30, 17, 21, 25, 29})); + + v_dstu = vec_perm(v_dstu, v_src1_3,((vector unsigned char) + {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 16, 20, 24, 28})); + v_dstv = vec_perm(v_dstv, v_src1_3,((vector unsigned char) + {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 18, 22, 26, 30})); + + vec_vsx_st((vector unsigned char)v_dstu, 0, (unsigned char *)dstu_addr); + vec_vsx_st((vector unsigned char)v_dstv, 0, (unsigned char *)dstv_addr); + + src1_addr += 64; + dstu_addr += 16; + dstv_addr += 16; + } + + for (i=width_adj; i< width_adj + frag_len; i++) { + dstU[i] = src1[4 * i + 0]; + dstV[i] = src1[4 * i + 2]; + } + av_assert1(src1 == src2); +} + +static av_always_inline void nvXXtoUV_c_vsx(uint8_t *dst1, uint8_t *dst2, const uint8_t *src, int width) +{ + int i, width_adj, frag_len; + + uintptr_t src_addr = (uintptr_t)src; + uintptr_t dst1_addr = (uintptr_t)dst1; + uintptr_t dst2_addr = (uintptr_t)dst2; + + // compute integral number of vector-length items and length of final fragment + width_adj = width >> 4; + width_adj = width_adj << 4; + frag_len = width - width_adj; + + for ( i = 0; i < width_adj; i += 16) { + vector unsigned char v_rd0 = vec_vsx_ld(0, (unsigned char *)src_addr); + vector unsigned char v_rd1 = vec_vsx_ld(0, (unsigned char *)(src_addr + 16)); + + vector unsigned char v_dst1 = vec_perm(v_rd0, v_rd1, ((vector unsigned char) + {0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30})); + vector unsigned char v_dst2 = vec_perm(v_rd0, v_rd1, ((vector unsigned char) + {1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31})); + + vec_vsx_st((vector unsigned char)v_dst1, 0, (unsigned char *)dst1_addr); + vec_vsx_st((vector unsigned char)v_dst2, 0, (unsigned char *)dst2_addr); + + src_addr += 32; + dst1_addr += 16; + dst2_addr += 16; + } + + for (i=width_adj; i< width_adj + frag_len; i++) { + dst1[i] = src[2 * i + 0]; + dst2[i] = src[2 * i + 1]; + } +} + +static void nv12ToUV_c_vsx(uint8_t *dstU, uint8_t *dstV, + const uint8_t *unused0, const uint8_t *src1, const uint8_t *src2, + int width, uint32_t *unused) +{ + nvXXtoUV_c_vsx(dstU, dstV, src1, width); +} + +static void nv21ToUV_c_vsx(uint8_t *dstU, uint8_t *dstV, + const uint8_t *unused0, const uint8_t *src1, const uint8_t *src2, + int width, uint32_t *unused) +{ + nvXXtoUV_c_vsx(dstV, dstU, src1, width); +} + +#endif /* HAVE_VSX */ + +av_cold void ff_sws_init_input_funcs_vsx(SwsContext *c) +{ +#if HAVE_VSX + + enum AVPixelFormat srcFormat = c->srcFormat; + + switch (srcFormat) { + case AV_PIX_FMT_YUYV422: + c->chrToYV12 = yuy2ToUV_c_vsx; + break; + case AV_PIX_FMT_YVYU422: + c->chrToYV12 = yvy2ToUV_c_vsx; + break; + case AV_PIX_FMT_UYVY422: + c->chrToYV12 = uyvyToUV_c_vsx; + break; + case AV_PIX_FMT_NV12: + c->chrToYV12 = nv12ToUV_c_vsx; + break; + case AV_PIX_FMT_NV21: + c->chrToYV12 = nv21ToUV_c_vsx; + break; + } + + switch (srcFormat) { + case AV_PIX_FMT_YUYV422: + case AV_PIX_FMT_YVYU422: + case AV_PIX_FMT_YA8: + c->lumToYV12 = yuy2ToY_c_vsx; + break; + case AV_PIX_FMT_UYVY422: + c->lumToYV12 = uyvyToY_c_vsx; + break; + } + + if (c->needAlpha) { + switch (srcFormat) { + case AV_PIX_FMT_BGRA: + case AV_PIX_FMT_RGBA: + c->alpToYV12 = rgbaToA_c_vsx; + break; + case AV_PIX_FMT_ABGR: + case AV_PIX_FMT_ARGB: + c->alpToYV12 = abgrToA_c_vsx; + break; + case AV_PIX_FMT_YA8: + c->alpToYV12 = uyvyToY_c_vsx; + break; + } + } + +#endif /* HAVE_VSX */ +} diff --git a/libswscale/swscale.c b/libswscale/swscale.c index bbea0fe..3e4d177 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -566,6 +566,9 @@ static av_cold void sws_init_swscale(SwsContext *c) ff_sws_init_input_funcs(c); + if (HAVE_VSX && (!HAVE_BIGENDIAN)) { + ff_sws_init_input_funcs_vsx(c); + } if (c->srcBpc == 8) { if (c->dstBpc <= 14) { diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 54cd85c..fc49894 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -881,6 +881,7 @@ void ff_get_unscaled_swscale_aarch64(SwsContext *c); SwsFunc ff_getSwsFunc(SwsContext *c); void ff_sws_init_input_funcs(SwsContext *c); +void ff_sws_init_input_funcs_vsx(SwsContext *c); void ff_sws_init_output_funcs(SwsContext *c, yuv2planar1_fn *yuv2plane1, yuv2planarX_fn *yuv2planeX,

1 0

avformat/mov: Skip non-key frames if AVDISCARD_NONKEY is set.
by git＠videolan.org 30 Jun '16

30 Jun '16

ffmpeg | branch: master | Vadim Kalinsky <vadim(a)kalinsky.ru> | Tue Jun 28 14:09:46 2016 -0400| [e370aad67ddb15033f656f6b1120c030c759f30b] | committer: Michael Niedermayer avformat/mov: Skip non-key frames if AVDISCARD_NONKEY is set. Github: Closes #222 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e370aad67ddb15033… --- libavformat/mov.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index a929f74..485bb0b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5224,6 +5224,12 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) sc->current_sample -= should_retry(sc->pb, ret64); return AVERROR_INVALIDDATA; } + + if( st->discard == AVDISCARD_NONKEY && 0==(sample->flags & AVINDEX_KEYFRAME) ) { + av_log(mov->fc, AV_LOG_DEBUG, "Nonkey frame from stream %d discarded due to AVDISCARD_NONKEY\n", sc->ffindex); + goto retry; + } + ret = av_get_packet(sc->pb, pkt, sample->size); if (ret < 0) { sc->current_sample -= should_retry(sc->pb, ret);

1 0