July 2021 - ffmpeg-cvslog - lists.ffmpeg.org

avfilter/avf_showfreqs: switch to TX FFT from avutil
by Paul B Mahol 30 Jul '21

30 Jul '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jul 30 09:24:49 2021 +0200| [ae94868a576c901f313c619950ec7d8a5f6ca615] | committer: Paul B Mahol avfilter/avf_showfreqs: switch to TX FFT from avutil > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae94868a576c901f3… --- configure | 3 --- libavfilter/avf_showfreqs.c | 52 ++++++++++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/configure b/configure index b61a189b07..94b30afe74 100755 --- a/configure +++ b/configure @@ -3654,8 +3654,6 @@ select_filter_select="scene_sad" sharpness_vaapi_filter_deps="vaapi" showcqt_filter_deps="avformat swscale" showcqt_filter_suggest="libfontconfig libfreetype" -showfreqs_filter_deps="avcodec" -showfreqs_filter_select="fft" showspatial_filter_deps="avcodec" showspatial_filter_select="fft" signature_filter_deps="gpl avcodec avformat" @@ -7281,7 +7279,6 @@ enabled sab_filter && prepend avfilter_deps "swscale" enabled scale_filter && prepend avfilter_deps "swscale" enabled scale2ref_filter && prepend avfilter_deps "swscale" enabled showcqt_filter && prepend avfilter_deps "avformat swscale" -enabled showfreqs_filter && prepend avfilter_deps "avcodec" enabled signature_filter && prepend avfilter_deps "avcodec avformat" enabled smartblur_filter && prepend avfilter_deps "swscale" enabled spectrumsynth_filter && prepend avfilter_deps "avcodec" diff --git a/libavfilter/avf_showfreqs.c b/libavfilter/avf_showfreqs.c index 0b8067116c..5dee3445a8 100644 --- a/libavfilter/avf_showfreqs.c +++ b/libavfilter/avf_showfreqs.c @@ -21,7 +21,7 @@ #include <float.h> #include <math.h> -#include "libavcodec/avfft.h" +#include "libavutil/tx.h" #include "libavutil/audio_fifo.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" @@ -49,12 +49,13 @@ typedef struct ShowFreqsContext { int data_mode; int cmode; int fft_size; - int fft_bits; int ascale, fscale; int avg; int win_func; - FFTContext *fft; - FFTComplex **fft_data; + AVTXContext *fft; + av_tx_fn tx_fn; + AVComplexFloat **fft_input; + AVComplexFloat **fft_data; float **avg_data; float *window_func_lut; float overlap; @@ -171,32 +172,36 @@ static int config_output(AVFilterLink *outlink) AVFilterContext *ctx = outlink->src; AVFilterLink *inlink = ctx->inputs[0]; ShowFreqsContext *s = ctx->priv; - float overlap; - int i; + float overlap, scale; + int i, ret; - s->fft_bits = av_log2(s->fft_size); - s->nb_freq = 1 << (s->fft_bits - 1); - s->win_size = s->nb_freq << 1; + s->nb_freq = s->fft_size / 2; + s->win_size = s->fft_size; av_audio_fifo_free(s->fifo); - av_fft_end(s->fft); - s->fft = av_fft_init(s->fft_bits, 0); - if (!s->fft) { + av_tx_uninit(&s->fft); + ret = av_tx_init(&s->fft, &s->tx_fn, AV_TX_FLOAT_FFT, 0, s->fft_size, &scale, 0); + if (ret < 0) { av_log(ctx, AV_LOG_ERROR, "Unable to create FFT context. " "The window size might be too high.\n"); - return AVERROR(ENOMEM); + return ret; } /* FFT buffers: x2 for each (display) channel buffer. * Note: we use free and malloc instead of a realloc-like function to * make sure the buffer is aligned in memory for the FFT functions. */ for (i = 0; i < s->nb_channels; i++) { + av_freep(&s->fft_input[i]); av_freep(&s->fft_data[i]); av_freep(&s->avg_data[i]); } + av_freep(&s->fft_input); av_freep(&s->fft_data); av_freep(&s->avg_data); s->nb_channels = inlink->channels; + s->fft_input = av_calloc(s->nb_channels, sizeof(*s->fft_input)); + if (!s->fft_input) + return AVERROR(ENOMEM); s->fft_data = av_calloc(s->nb_channels, sizeof(*s->fft_data)); if (!s->fft_data) return AVERROR(ENOMEM); @@ -204,9 +209,10 @@ static int config_output(AVFilterLink *outlink) if (!s->avg_data) return AVERROR(ENOMEM); for (i = 0; i < s->nb_channels; i++) { - s->fft_data[i] = av_calloc(s->win_size, sizeof(**s->fft_data)); + s->fft_input[i] = av_calloc(FFALIGN(s->win_size, 512), sizeof(**s->fft_input)); + s->fft_data[i] = av_calloc(FFALIGN(s->win_size, 512), sizeof(**s->fft_data)); s->avg_data[i] = av_calloc(s->nb_freq, sizeof(**s->avg_data)); - if (!s->fft_data[i] || !s->avg_data[i]) + if (!s->fft_data[i] || !s->avg_data[i] || !s->fft_input[i]) return AVERROR(ENOMEM); } @@ -385,19 +391,18 @@ static int plot_freqs(AVFilterLink *inlink, AVFrame *in) const float *p = (float *)in->extended_data[ch]; for (n = 0; n < in->nb_samples; n++) { - s->fft_data[ch][n].re = p[n] * s->window_func_lut[n]; - s->fft_data[ch][n].im = 0; + s->fft_input[ch][n].re = p[n] * s->window_func_lut[n]; + s->fft_input[ch][n].im = 0; } for (; n < win_size; n++) { - s->fft_data[ch][n].re = 0; - s->fft_data[ch][n].im = 0; + s->fft_input[ch][n].re = 0; + s->fft_input[ch][n].im = 0; } } /* run FFT on each samples set */ for (ch = 0; ch < s->nb_channels; ch++) { - av_fft_permute(s->fft, s->fft_data[ch]); - av_fft_calc(s->fft, s->fft_data[ch]); + s->tx_fn(s->fft, s->fft_data[ch], s->fft_input[ch], sizeof(float)); } #define RE(x, ch) s->fft_data[ch][x].re @@ -526,13 +531,16 @@ static av_cold void uninit(AVFilterContext *ctx) ShowFreqsContext *s = ctx->priv; int i; - av_fft_end(s->fft); + av_tx_uninit(&s->fft); for (i = 0; i < s->nb_channels; i++) { + if (s->fft_input) + av_freep(&s->fft_input[i]); if (s->fft_data) av_freep(&s->fft_data[i]); if (s->avg_data) av_freep(&s->avg_data[i]); } + av_freep(&s->fft_input); av_freep(&s->fft_data); av_freep(&s->avg_data); av_freep(&s->window_func_lut);

1 0

avformat/mxfdec: fix frame wrapping detection for J2K essence container
by Pierre-Anthony Lemieux 29 Jul '21

29 Jul '21

ffmpeg | branch: master | Pierre-Anthony Lemieux <pal(a)sandflow.com> | Sun Jul 18 11:07:43 2021 -0700| [74e43824421bac9fa0816dce8b069eeab6f4cd07] | committer: Marton Balint avformat/mxfdec: fix frame wrapping detection for J2K essence container For JPEG 2000 essence, the MXF input format module currently uses the value of byte 14 of the essence container UL to determine whether the J2K essence is clip- (byte 14 is 0x02) or frame-wrapped (byte 14 is 0x01). Otherwise it assumes an unknown wrapping. Additional wrappings are documented in SMPTE ST422:2019: 0x03: Interlaced Frame, 1 field/KLV 0x04: Interlaced Frame, 2 fields/KLV 0x05: Field-wrapped Picture Element 0x06: Frame-wrapped Picture Element And these should also be handled as frame wrapped content. Signed-off-by: Pierre-Anthony Lemieux <pal(a)sandflow.com> Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=74e43824421bac9fa… --- libavformat/mxf.h | 3 ++- libavformat/mxfdec.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/mxf.h b/libavformat/mxf.h index eb473d8a55..fe9c52732c 100644 --- a/libavformat/mxf.h +++ b/libavformat/mxf.h @@ -76,7 +76,8 @@ typedef enum { NormalWrap = 0, D10D11Wrap, RawAWrap, - RawVWrap + RawVWrap, + J2KWrap } MXFWrappingIndicatorType; typedef struct MXFLocalTagPair { diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index f93cc30f0e..f491914bf1 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1411,7 +1411,7 @@ static void *mxf_resolve_strong_ref(MXFContext *mxf, UID *strong_ref, enum MXFMe static const MXFCodecUL mxf_picture_essence_container_uls[] = { // video essence container uls - { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x0c,0x01,0x00 }, 14, AV_CODEC_ID_JPEG2000, NULL, 14 }, + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x0c,0x01,0x00 }, 14, AV_CODEC_ID_JPEG2000, NULL, 14, J2KWrap }, { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x10,0x60,0x01 }, 14, AV_CODEC_ID_H264, NULL, 15 }, /* H.264 */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 }, 14, AV_CODEC_ID_DNXHD, NULL, 14 }, /* VC-3 */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x12,0x01,0x00 }, 14, AV_CODEC_ID_VC1, NULL, 14 }, /* VC-1 */ @@ -1495,6 +1495,10 @@ static MXFWrappingScheme mxf_get_wrapping_kind(UID *essence_container_ul) if (val == 0x02) val = 0x01; break; + case J2KWrap: + if (val != 0x02) + val = 0x01; + break; } if (val == 0x01) return FrameWrapped;

1 0

postproc/postprocess: Remove legacy cruft
by Andreas Rheinhardt 29 Jul '21

29 Jul '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Jul 23 16:24:45 2021 +0200| [610658c146f54858a5da351926fe685ca4961db7] | committer: Andreas Rheinhardt postproc/postprocess: Remove legacy cruft Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=610658c146f54858a… --- libpostproc/postprocess.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h index 348ee7cc61..ba456cf3e0 100644 --- a/libpostproc/postprocess.h +++ b/libpostproc/postprocess.h @@ -58,13 +58,7 @@ const char *postproc_license(void); typedef void pp_context; typedef void pp_mode; -#if LIBPOSTPROC_VERSION_INT < (52<<16) -typedef pp_context pp_context_t; -typedef pp_mode pp_mode_t; -extern const char *const pp_help; ///< a simple help text -#else extern const char pp_help[]; ///< a simple help text -#endif void pp_postprocess(const uint8_t * src[3], const int srcStride[3], uint8_t * dst[3], const int dstStride[3],

1 0

(postproc|swresample)/version: Don't include libavutil/avutil.h
by Andreas Rheinhardt 29 Jul '21

29 Jul '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Jul 23 16:21:56 2021 +0200| [21e732b919eabf1e5b4bc965f89aa5ece9c6db4b] | committer: Andreas Rheinhardt (postproc|swresample)/version: Don't include libavutil/avutil.h Instead only include libavutil/version.h; including avutil.h is a remnant from the time in which the version was in it. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21e732b919eabf1e5… --- libpostproc/version.h | 2 +- libswresample/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libpostproc/version.h b/libpostproc/version.h index 3819b68997..e518ccf810 100644 --- a/libpostproc/version.h +++ b/libpostproc/version.h @@ -26,7 +26,7 @@ * Libpostproc version macros */ -#include "libavutil/avutil.h" +#include "libavutil/version.h" #define LIBPOSTPROC_VERSION_MAJOR 56 #define LIBPOSTPROC_VERSION_MINOR 0 diff --git a/libswresample/version.h b/libswresample/version.h index ed7ce529d2..5f0d69228c 100644 --- a/libswresample/version.h +++ b/libswresample/version.h @@ -26,7 +26,7 @@ * Libswresample version macros */ -#include "libavutil/avutil.h" +#include "libavutil/version.h" #define LIBSWRESAMPLE_VERSION_MAJOR 4 #define LIBSWRESAMPLE_VERSION_MINOR 0

1 0

avutil/error: Include macros.h for MKTAG
by Andreas Rheinhardt 29 Jul '21

29 Jul '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Jul 23 07:41:54 2021 +0200| [5088c7c73304d25f791790cece20a291d25b6a18] | committer: Andreas Rheinhardt avutil/error: Include macros.h for MKTAG Up until now, including error.h alone does not make the AVERROR_* defines usable, because they just expand to something involving MKTAG, but without the header providing MKTAG. So include macros.h, the header providing MKTAG. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5088c7c73304d25f7… --- libavutil/error.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/error.h b/libavutil/error.h index 71df4da353..0d3269aa6d 100644 --- a/libavutil/error.h +++ b/libavutil/error.h @@ -27,6 +27,8 @@ #include <errno.h> #include <stddef.h> +#include "macros.h" + /** * @addtogroup lavu_error *

1 0

avutil/common, macros: Move several macros from common.h to macros.h
by Andreas Rheinhardt 29 Jul '21

29 Jul '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Jul 23 18:52:27 2021 +0200| [2dd8acbe800f6ea3b72ebe730f8ed95a5c3dd407] | committer: Andreas Rheinhardt avutil/common, macros: Move several macros from common.h to macros.h common.h currently contains several things: Math macros, UTF-8 macros, other fundamental macros; furthermore it also contains miscellaneous math functions and it (directly and indirectly) includes lots of other headers. This commit moves the "other fundamental macros" to macros.h which is a more fitting place. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2dd8acbe800f6ea3b… --- doc/APIchanges | 5 +++++ libavutil/common.h | 29 ----------------------------- libavutil/macros.h | 30 ++++++++++++++++++++++++++++++ libavutil/version.h | 2 +- 4 files changed, 36 insertions(+), 30 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 9506059ac0..cd1902179f 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,11 @@ libavutil: 2021-04-27 API changes, most recent first: + +2021-07-23 - xxxxxxxxxx - lavu 57.3.100 - common.h macros.h + Move several macros (AV_NE, FFDIFFSIGN, FFMAX, FFMAX3, FFMIN, FFMIN3, + FFSWAP, FF_ARRAY_ELEMS, MKTAG, MKBETAG) from common.h to macros.h. + 2021-07-22 - xxxxxxxxxx - lavu 57.2.100 - film_grain_params.h Add AV_FILM_GRAIN_PARAMS_H274, AVFilmGrainH274Params diff --git a/libavutil/common.h b/libavutil/common.h index aee353d399..3cc1f07566 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -42,13 +42,6 @@ #include "attributes.h" #include "macros.h" #include "version.h" -#include "libavutil/avconfig.h" - -#if AV_HAVE_BIGENDIAN -# define AV_NE(be, le) (be) -#else -# define AV_NE(be, le) (le) -#endif //rounded division & shift #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) @@ -89,25 +82,6 @@ #define FFABSU(a) ((a) <= 0 ? -(unsigned)(a) : (unsigned)(a)) #define FFABS64U(a) ((a) <= 0 ? -(uint64_t)(a) : (uint64_t)(a)) -/** - * Comparator. - * For two numerical expressions x and y, gives 1 if x > y, -1 if x < y, and 0 - * if x == y. This is useful for instance in a qsort comparator callback. - * Furthermore, compilers are able to optimize this to branchless code, and - * there is no risk of overflow with signed types. - * As with many macros, this evaluates its argument multiple times, it thus - * must not have a side-effect. - */ -#define FFDIFFSIGN(x,y) (((x)>(y)) - ((x)<(y))) - -#define FFMAX(a,b) ((a) > (b) ? (a) : (b)) -#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c) -#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) -#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c) - -#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) -#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0])) - /* misc math functions */ #ifdef HAVE_AV_CONFIG_H @@ -475,9 +449,6 @@ static av_always_inline av_const int av_parity_c(uint32_t v) return av_popcount(v) & 1; } -#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24)) -#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24)) - /** * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form. * diff --git a/libavutil/macros.h b/libavutil/macros.h index 2007ee5619..2a7567c3ea 100644 --- a/libavutil/macros.h +++ b/libavutil/macros.h @@ -25,6 +25,36 @@ #ifndef AVUTIL_MACROS_H #define AVUTIL_MACROS_H +#include "libavutil/avconfig.h" + +#if AV_HAVE_BIGENDIAN +# define AV_NE(be, le) (be) +#else +# define AV_NE(be, le) (le) +#endif + +/** + * Comparator. + * For two numerical expressions x and y, gives 1 if x > y, -1 if x < y, and 0 + * if x == y. This is useful for instance in a qsort comparator callback. + * Furthermore, compilers are able to optimize this to branchless code, and + * there is no risk of overflow with signed types. + * As with many macros, this evaluates its argument multiple times, it thus + * must not have a side-effect. + */ +#define FFDIFFSIGN(x,y) (((x)>(y)) - ((x)<(y))) + +#define FFMAX(a,b) ((a) > (b) ? (a) : (b)) +#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c) +#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) +#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c) + +#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) +#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0])) + +#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24)) +#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24)) + /** * @addtogroup preproc_misc Preprocessor String Macros * diff --git a/libavutil/version.h b/libavutil/version.h index 77ca4becd6..6b4a265457 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 2 +#define LIBAVUTIL_VERSION_MINOR 3 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

1 0

avformat/internal: Move ff_read_line_to_bprint_overwrite to avio_internal.h
by Andreas Rheinhardt 29 Jul '21

29 Jul '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Jul 23 04:01:44 2021 +0200| [fd101c9c3bcdeb2d74274aaeaa968fe8ead3622d] | committer: Andreas Rheinhardt avformat/internal: Move ff_read_line_to_bprint_overwrite to avio_internal.h It only uses an AVIOContext and an AVBPrint. When doing so, it turned out that several non-users of ff_read_line_to_bprint_overwrite() and ff_bprint_to_codecpar_extradata() relied on libavformat/internal.h to include bprint.h or avstring.h for them. In order to avoid a repeat of this and in order to reduce unnecessary dependencies, a forward declaration of struct AVBPrint is used instead of including bprint.h. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd101c9c3bcdeb2d7… --- libavdevice/v4l2.c | 1 + libavformat/aadec.c | 1 + libavformat/argo_asf.c | 1 + libavformat/argo_cvg.c | 1 + libavformat/au.c | 1 + libavformat/avio_internal.h | 14 ++++++++++++++ libavformat/concatdec.c | 1 + libavformat/dashdec.c | 1 + libavformat/dashenc.c | 1 + libavformat/flacenc.c | 1 + libavformat/framecrcenc.c | 1 + libavformat/hlsenc.c | 1 + libavformat/internal.h | 16 +--------------- libavformat/librist.c | 1 + libavformat/mxfdec.c | 1 + libavformat/ttmlenc.c | 1 + libavformat/utils.c | 1 + 17 files changed, 30 insertions(+), 15 deletions(-) diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 1c0de118cc..b5997fba33 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -33,6 +33,7 @@ #include <stdatomic.h> #include "libavutil/avassert.h" +#include "libavutil/avstring.h" #include "v4l2-common.h" #include <dirent.h> diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 247c498147..9771a1df81 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -25,6 +25,7 @@ #include "avformat.h" #include "internal.h" +#include "libavutil/avstring.h" #include "libavutil/dict.h" #include "libavutil/intreadwrite.h" #include "libavutil/tea.h" diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 0bc09522c0..5adafb7230 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -19,6 +19,7 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avstring.h" #include "avformat.h" #include "internal.h" #include "libavutil/channel_layout.h" diff --git a/libavformat/argo_cvg.c b/libavformat/argo_cvg.c index 11f68c2405..e1854b4493 100644 --- a/libavformat/argo_cvg.c +++ b/libavformat/argo_cvg.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/au.c b/libavformat/au.c index ff8f841cce..9bd408f65c 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -27,6 +27,7 @@ * http://www.goice.co.jp/member/mo/formats/au.html */ +#include "libavutil/bprint.h" #include "avformat.h" #include "internal.h" #include "avio_internal.h" diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index fe87f2a288..2c6d00b5ff 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -187,4 +187,18 @@ void ffio_reset_dyn_buf(AVIOContext *s); */ void ffio_free_dyn_buf(AVIOContext **s); +struct AVBPrint; +/** + * Read a whole line of text from AVIOContext to an AVBPrint buffer overwriting + * its contents. Stop reading after reaching a \\r, a \\n, a \\r\\n, a \\0 or + * EOF. The line ending characters are NOT included in the buffer, but they + * are skipped on the input. + * + * @param s the read-only AVIOContext + * @param bp the AVBPrint buffer + * @return the length of the read line not including the line endings, + * negative on error, or if the buffer becomes truncated. + */ +int64_t ff_read_line_to_bprint_overwrite(AVIOContext *s, struct AVBPrint *bp); + #endif /* AVFORMAT_AVIO_INTERNAL_H */ diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 74354fce25..934e9c02fc 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -26,6 +26,7 @@ #include "libavutil/timestamp.h" #include "libavcodec/bsf.h" #include "avformat.h" +#include "avio_internal.h" #include "internal.h" #include "url.h" diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 11966f905c..6105ec46d9 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include <libxml/parser.h> +#include "libavutil/bprint.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" #include "libavutil/time.h" diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 2b8fbcbe6e..679e30611c 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -28,6 +28,7 @@ #include "libavutil/avassert.h" #include "libavutil/avutil.h" #include "libavutil/avstring.h" +#include "libavutil/bprint.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index d8cf3ea4db..44c9341493 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c index 56f7ea1b5a..ab79903e31 100644 --- a/libavformat/framecrcenc.c +++ b/libavformat/framecrcenc.c @@ -22,6 +22,7 @@ #include <inttypes.h> #include "libavutil/adler32.h" +#include "libavutil/avstring.h" #include "libavcodec/codec_id.h" #include "libavcodec/codec_par.h" diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 151ef6ec8f..6447f9bf48 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -37,6 +37,7 @@ #include "libavutil/mathematics.h" #include "libavutil/parseutils.h" #include "libavutil/avstring.h" +#include "libavutil/bprint.h" #include "libavutil/intreadwrite.h" #include "libavutil/random_seed.h" #include "libavutil/opt.h" diff --git a/libavformat/internal.h b/libavformat/internal.h index d71852afb9..002aeb6601 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -23,8 +23,6 @@ #include <stdint.h> -#include "libavutil/bprint.h" - #include "libavcodec/avcodec.h" #include "libavcodec/bsf.h" @@ -539,19 +537,6 @@ int ff_get_line(AVIOContext *s, char *buf, int maxlen); */ int ff_get_chomp_line(AVIOContext *s, char *buf, int maxlen); -/** - * Read a whole line of text from AVIOContext to an AVBPrint buffer overwriting - * its contents. Stop reading after reaching a \\r, a \\n, a \\r\\n, a \\0 or - * EOF. The line ending characters are NOT included in the buffer, but they - * are skipped on the input. - * - * @param s the read-only AVIOContext - * @param bp the AVBPrint buffer - * @return the length of the read line not including the line endings, - * negative on error, or if the buffer becomes truncated. - */ -int64_t ff_read_line_to_bprint_overwrite(AVIOContext *s, AVBPrint *bp); - #define SPACE_CHARS " \t\r\n" /** @@ -931,6 +916,7 @@ int ff_reshuffle_raw_rgb(AVFormatContext *s, AVPacket **ppkt, AVCodecParameters */ int ff_get_packet_palette(AVFormatContext *s, AVPacket *pkt, int ret, uint32_t *palette); +struct AVBPrint; /** * Finalize buf into extradata and set its size appropriately. */ diff --git a/libavformat/librist.c b/libavformat/librist.c index 01a3f9c122..8f51050c3e 100644 --- a/libavformat/librist.c +++ b/libavformat/librist.c @@ -22,6 +22,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/avstring.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "libavutil/time.h" diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 52fbbc6e35..f93cc30f0e 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -47,6 +47,7 @@ #include <inttypes.h> #include "libavutil/aes.h" +#include "libavutil/avstring.h" #include "libavutil/mastering_display_metadata.h" #include "libavutil/mathematics.h" #include "libavcodec/bytestream.h" diff --git a/libavformat/ttmlenc.c b/libavformat/ttmlenc.c index 7577cb543b..8546d35196 100644 --- a/libavformat/ttmlenc.c +++ b/libavformat/ttmlenc.c @@ -27,6 +27,7 @@ * @see https://www.w3.org/TR/ttml-imsc/rec */ +#include "libavutil/avstring.h" #include "avformat.h" #include "internal.h" #include "libavcodec/ttmlenc.h" diff --git a/libavformat/utils.c b/libavformat/utils.c index 508a2b8bc2..60d7364018 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -25,6 +25,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/bprint.h" #include "libavutil/dict.h" #include "libavutil/internal.h" #include "libavutil/mathematics.h"

1 0

avformat/aviobuf: Make ff_read_line_to_bprint() static
by Andreas Rheinhardt 29 Jul '21

29 Jul '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Jul 23 03:06:26 2021 +0200| [642b202567d5c18af65a9cf97a46e2ee60084490] | committer: Andreas Rheinhardt avformat/aviobuf: Make ff_read_line_to_bprint() static It is only used in ff_read_line_to_bprint_overwrite(). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=642b202567d5c18af… --- libavformat/aviobuf.c | 4 ++-- libavformat/internal.h | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index ddfa4ecbf1..66fddf1433 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -794,7 +794,7 @@ int ff_get_chomp_line(AVIOContext *s, char *buf, int maxlen) return len; } -int64_t ff_read_line_to_bprint(AVIOContext *s, AVBPrint *bp) +static int64_t read_line_to_bprint(AVIOContext *s, AVBPrint *bp) { int len, end; int64_t read = 0; @@ -830,7 +830,7 @@ int64_t ff_read_line_to_bprint_overwrite(AVIOContext *s, AVBPrint *bp) int64_t ret; av_bprint_clear(bp); - ret = ff_read_line_to_bprint(s, bp); + ret = read_line_to_bprint(s, bp); if (ret < 0) return ret; diff --git a/libavformat/internal.h b/libavformat/internal.h index bff948e9a3..d71852afb9 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -539,19 +539,6 @@ int ff_get_line(AVIOContext *s, char *buf, int maxlen); */ int ff_get_chomp_line(AVIOContext *s, char *buf, int maxlen); -/** - * Read a whole line of text from AVIOContext to an AVBPrint buffer. Stop - * reading after reaching a \\r, a \\n, a \\r\\n, a \\0 or EOF. The line - * ending characters are NOT included in the buffer, but they are skipped on - * the input. - * - * @param s the read-only AVIOContext - * @param bp the AVBPrint buffer - * @return the length of the read line, not including the line endings, - * negative on error. - */ -int64_t ff_read_line_to_bprint(AVIOContext *s, AVBPrint *bp); - /** * Read a whole line of text from AVIOContext to an AVBPrint buffer overwriting * its contents. Stop reading after reaching a \\r, a \\n, a \\r\\n, a \\0 or

1 0

avcodec/noise_bsf: add expr support
by Gyan Doshi 29 Jul '21

29 Jul '21

ffmpeg | branch: master | Gyan Doshi <ffmpeg(a)gyani.pro> | Sun Jul 25 15:49:54 2021 +0530| [23da5caf094a7c20dd3cd59ebd2ddd8b0f5950fc] | committer: Gyan Doshi avcodec/noise_bsf: add expr support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23da5caf094a7c20d… --- doc/bitstream_filters.texi | 64 ++++++++++++++---- libavcodec/noise_bsf.c | 161 ++++++++++++++++++++++++++++++++++++++++----- tests/fate/matroska.mak | 2 +- 3 files changed, 199 insertions(+), 28 deletions(-) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index d10842ae47..18a758635f 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -534,20 +534,62 @@ container. Can be used for fuzzing or testing error resilience/concealment. Parameters: @table @option @item amount -A numeral string, whose value is related to how often output bytes will -be modified. Therefore, values below or equal to 0 are forbidden, and -the lower the more frequent bytes will be modified, with 1 meaning -every byte is modified. -@item dropamount -A numeral string, whose value is related to how often packets will be dropped. -Therefore, values below or equal to 0 are forbidden, and the lower the more -frequent packets will be dropped, with 1 meaning every packet is dropped. +Accepts an expression whose evaluation per-packet determines how often bytes in that +packet will be modified. A value below 0 will result in a variable frequency. +Default is 0 which results in no modification. However, if neither amount nor drop is specified, +amount will be set to @var{-1}. See below for accepted variables. +@item drop, dropamount +Accepts an expression evaluated per-packet whose value determines whether that packet is dropped. +Evaluation to a positive value results in the packet being dropped. Evaluation to a negative +value results in a variable chance of it being dropped, roughly inverse in proportion to the magnitude +of the value. Default is 0 which results in no drops. See below for accepted variables. @end table -The following example applies the modification to every byte but does not drop -any packets. +Both @code{amount} and @code{drop} accept expressions containing the following variables: + +@table @samp +@item n +The index of the packet, starting from zero. +@item tb +The timebase for packet timestamps. +@item pts +Packet presentation timestamp. +@item dts +Packet decoding timestamp. +@item nopts +Constant representing AV_NOPTS_VALUE. +@item startpts +First non-AV_NOPTS_VALUE PTS seen in the stream. +@item startdts +First non-AV_NOPTS_VALUE DTS seen in the stream. +@item duration +@itemx d +Packet duration, in timebase units. +@item pos +Packet position in input; may be -1 when unknown or not set. +@item size +Packet size, in bytes. +@item key +Whether packet is marked as a keyframe. +@item state +A pseudo random integer, primarily derived from the content of packet payload. +@end table + +@subsection Examples +Apply modification to every byte but don't drop any packets. +@example +ffmpeg -i INPUT -c copy -bsf noise=1 output.mkv +@end example + +Drop every video packet not marked as a keyframe after timestamp 30s but do not +modify any of the remaining packets. +@example +ffmpeg -i INPUT -c copy -bsf:v noise=drop='gt(t\,30)*not(key)' output.mkv +@end example + +Drop one second of audio every 10 seconds and add some random noise to the rest. @example -ffmpeg -i INPUT -c copy -bsf noise[=1] output.mkv +ffmpeg -i INPUT -c copy -bsf:a noise=amount=-1:drop='between(mod(t\,10)\,9\,10)' output.mkv @end example @section null diff --git a/libavcodec/noise_bsf.c b/libavcodec/noise_bsf.c index 6ebd369633..9d7ef93001 100644 --- a/libavcodec/noise_bsf.c +++ b/libavcodec/noise_bsf.c @@ -23,55 +23,182 @@ #include "bsf.h" #include "bsf_internal.h" +#include "libavutil/avstring.h" #include "libavutil/log.h" #include "libavutil/opt.h" +#include "libavutil/eval.h" + +static const char *const var_names[] = { + "n", /// packet index, starting from zero + "tb", /// timebase + "pts", /// packet presentation timestamp + "dts", /// packet decoding timestamp + "nopts", /// AV_NOPTS_VALUE + "startpts", /// first seen non-AV_NOPTS_VALUE packet timestamp + "startdts", /// first seen non-AV_NOPTS_VALUE packet timestamp + "duration", "d", /// packet duration + "pos", /// original position of packet in its source + "size", /// packet size + "key" , /// packet keyframe flag + "state", /// random-ish state + NULL +}; + +enum var_name { + VAR_N, + VAR_TB, + VAR_PTS, + VAR_DTS, + VAR_NOPTS, + VAR_STARTPTS, + VAR_STARTDTS, + VAR_DURATION, VAR_D, + VAR_POS, + VAR_SIZE, + VAR_KEY, + VAR_STATE, + VAR_VARS_NB +}; typedef struct NoiseContext { const AVClass *class; - int amount; - int dropamount; + + char *amount_str; + char *drop_str; + + AVExpr *amount_pexpr; + AVExpr *drop_pexpr; + + double var_values[VAR_VARS_NB]; + unsigned int state; + unsigned int pkt_idx; } NoiseContext; -static int noise(AVBSFContext *ctx, AVPacket *pkt) +static int noise_init(AVBSFContext *ctx) { NoiseContext *s = ctx->priv_data; - int amount = s->amount > 0 ? s->amount : (s->state % 10001 + 1); - int i, ret; + int ret; - if (amount <= 0) - return AVERROR(EINVAL); + if (!s->amount_str) { + s->amount_str = !s->drop_str ? av_strdup("-1") : av_strdup("0"); + if (!s->amount_str) + return AVERROR(ENOMEM); + } + + ret = av_expr_parse(&s->amount_pexpr, s->amount_str, + var_names, NULL, NULL, NULL, NULL, 0, ctx); + if (ret < 0) { + av_log(ctx, AV_LOG_ERROR, "Error in parsing expr for amount: %s\n", s->amount_str); + return ret; + } + + if (s->drop_str) { + ret = av_expr_parse(&s->drop_pexpr, s->drop_str, + var_names, NULL, NULL, NULL, NULL, 0, ctx); + if (ret < 0) { + av_log(ctx, AV_LOG_ERROR, "Error in parsing expr for drop: %s\n", s->drop_str); + return ret; + } + } + + s->var_values[VAR_TB] = ctx->time_base_out.den ? av_q2d(ctx->time_base_out) : 0; + s->var_values[VAR_NOPTS] = AV_NOPTS_VALUE; + s->var_values[VAR_STARTPTS] = AV_NOPTS_VALUE; + s->var_values[VAR_STARTDTS] = AV_NOPTS_VALUE; + s->var_values[VAR_STATE] = 0; + + return 0; +} + +static int noise(AVBSFContext *ctx, AVPacket *pkt) +{ + NoiseContext *s = ctx->priv_data; + int i, ret, amount, drop; + double res; ret = ff_bsf_get_packet_ref(ctx, pkt); if (ret < 0) return ret; - if (s->dropamount > 0 && s->state % s->dropamount == 0) { - s->state++; + s->var_values[VAR_N] = s->pkt_idx++; + s->var_values[VAR_PTS] = pkt->pts; + s->var_values[VAR_DTS] = pkt->dts; + s->var_values[VAR_DURATION] = + s->var_values[VAR_D] = pkt->duration; + s->var_values[VAR_SIZE] = pkt->size; + s->var_values[VAR_KEY] = !!(pkt->flags & AV_PKT_FLAG_KEY); + s->var_values[VAR_POS] = pkt->pos; + + if (s->var_values[VAR_STARTPTS] == AV_NOPTS_VALUE) + s->var_values[VAR_STARTPTS] = pkt->pts; + + if (s->var_values[VAR_STARTDTS] == AV_NOPTS_VALUE) + s->var_values[VAR_STARTDTS] = pkt->dts; + + res = av_expr_eval(s->amount_pexpr, s->var_values, NULL); + + if (isnan(res)) + amount = 0; + else if (res < 0) + amount = (s->state % 10001 + 1); + else + amount = (int)res; + + if (s->drop_str) { + res = av_expr_eval(s->drop_pexpr, s->var_values, NULL); + + if (isnan(res)) + drop = 0; + else if (res < 0) + drop = !(s->state % FFABS((int)res)); + else + drop = !!res; + } + + av_log(ctx, AV_LOG_VERBOSE, "Stream #%d packet %d pts %"PRId64" - amount %d drop %d\n", + pkt->stream_index, (unsigned int)s->var_values[VAR_N], pkt->pts, amount, drop); + + if (s->drop_str && drop) { + s->var_values[VAR_STATE] = ++s->state; av_packet_unref(pkt); return AVERROR(EAGAIN); } - ret = av_packet_make_writable(pkt); - if (ret < 0) { - av_packet_unref(pkt); - return ret; + if (amount) { + ret = av_packet_make_writable(pkt); + if (ret < 0) { + av_packet_unref(pkt); + return ret; + } } for (i = 0; i < pkt->size; i++) { s->state += pkt->data[i] + 1; - if (s->state % amount == 0) + if (amount && s->state % amount == 0) pkt->data[i] = s->state; } + s->var_values[VAR_STATE] = s->state; + return 0; } +static void noise_close(AVBSFContext *bsf) +{ + NoiseContext *s = bsf->priv_data; + + av_expr_free(s->amount_pexpr); + av_expr_free(s->drop_pexpr); + s->amount_pexpr = s->drop_pexpr = NULL; +} + #define OFFSET(x) offsetof(NoiseContext, x) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_BSF_PARAM) static const AVOption options[] = { - { "amount", NULL, OFFSET(amount), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, - { "dropamount", NULL, OFFSET(dropamount), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, + { "amount", NULL, OFFSET(amount_str), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, FLAGS }, + { "drop", NULL, OFFSET(drop_str), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, FLAGS }, + { "dropamount", NULL, OFFSET(drop_str), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, FLAGS }, { NULL }, }; @@ -86,5 +213,7 @@ const AVBitStreamFilter ff_noise_bsf = { .name = "noise", .priv_data_size = sizeof(NoiseContext), .priv_class = &noise_class, + .init = noise_init, + .close = noise_close, .filter = noise, }; diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index ca7193a055..b57765280a 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -88,7 +88,7 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MXF_DEMUXER \ MATROSKA_MUXER MATROSKA_DEMUXER \ FRAMECRC_MUXER PIPE_PROTOCOL) \ += fate-matroska-mastering-display-metadata -fate-matroska-mastering-display-metadata: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Meridian-Apple_ProResProxy-HDR10.mxf matroska "-map 0 -map 0:0 -c:v:0 copy -c:v:1 ffv1 -c:a:0 copy -bsf:a:0 noise=amount=3 -filter:a:1 aresample -c:a:1 pcm_s16be -bsf:a:1 noise=dropamount=4" "-map 0 -c copy" "" "-show_entries stream_side_data_list:stream=index,codec_name" +fate-matroska-mastering-display-metadata: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Meridian-Apple_ProResProxy-HDR10.mxf matroska "-map 0 -map 0:0 -c:v:0 copy -c:v:1 ffv1 -c:a:0 copy -bsf:a:0 noise=amount=3 -filter:a:1 aresample -c:a:1 pcm_s16be -bsf:a:1 noise=amount=-1:dropamount=-4" "-map 0 -c copy" "" "-show_entries stream_side_data_list:stream=index,codec_name" # This test tests remuxing annex B H.264 into Matroska. It also tests writing # the correct interlaced flags and overriding the sample aspect ratio, leading

1 0

avcodec/mips: cabac.h provide fallback for wsbh instruction
by Jiaxun Yang 28 Jul '21

28 Jul '21

ffmpeg | branch: master | Jiaxun Yang <jiaxun.yang(a)flygoat.com> | Fri Jul 23 13:53:44 2021 +0800| [2323d3a92376f34c4499ba9851a52e7ca9031d46] | committer: Michael Niedermayer avcodec/mips: cabac.h provide fallback for wsbh instruction wsbh is only avilable for MIPS R2+. Provide a fallback for older processors. Signed-off-by: Jiaxun Yang <jiaxun.yang(a)flygoat.com> Reviewed-by: Shiyou Yin <yinshiyou-hf(a)loongson.cn> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2323d3a92376f34c4… --- libavcodec/mips/cabac.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libavcodec/mips/cabac.h b/libavcodec/mips/cabac.h index f1e953dabe..39c308c7e0 100644 --- a/libavcodec/mips/cabac.h +++ b/libavcodec/mips/cabac.h @@ -77,7 +77,15 @@ static av_always_inline int get_cabac_inline_mips(CABACContext *c, "lhu %[tmp0], 0(%[c_bytestream]) \n\t" #else "lhu %[tmp0], 0(%[c_bytestream]) \n\t" +#if HAVE_MIPS32R2 || HAVE_MIPS64R2 "wsbh %[tmp0], %[tmp0] \n\t" +#else + "and %[tmp1], %[tmp0], 0xff00ff00 \n\t" + "srl %[tmp1], %[tmp1], 8 \n\t" + "and %[tmp0], %[tmp0], 0x00ff00ff \n\t" + "sll %[tmp0], %[tmp0], 8 \n\t" + "or %[tmp0], %[tmp0], %[tmp1] \n\t" +#endif #endif PTR_SLL "%[tmp0], %[tmp0], 0x01 \n\t" PTR_SUBU "%[tmp0], %[tmp0], %[cabac_mask] \n\t" @@ -125,7 +133,15 @@ static av_always_inline int get_cabac_bypass_mips(CABACContext *c) "lhu %[tmp1], 0(%[c_bytestream]) \n\t" #else "lhu %[tmp1], 0(%[c_bytestream]) \n\t" +#if HAVE_MIPS32R2 || HAVE_MIPS64R2 "wsbh %[tmp1], %[tmp1] \n\t" +#else + "and %[tmp0], %[tmp1], 0xff00ff00 \n\t" + "srl %[tmp0], %[tmp0], 8 \n\t" + "and %[tmp1], %[tmp1], 0x00ff00ff \n\t" + "sll %[tmp1], %[tmp1], 8 \n\t" + "or %[tmp1], %[tmp1], %[tmp0] \n\t" +#endif #endif PTR_SLL "%[tmp1], %[tmp1], 0x01 \n\t" PTR_SUBU "%[tmp1], %[tmp1], %[cabac_mask] \n\t" @@ -169,7 +185,15 @@ static av_always_inline int get_cabac_bypass_sign_mips(CABACContext *c, int val) "lhu %[tmp1], 0(%[c_bytestream]) \n\t" #else "lhu %[tmp1], 0(%[c_bytestream]) \n\t" +#if HAVE_MIPS32R2 || HAVE_MIPS64R2 "wsbh %[tmp1], %[tmp1] \n\t" +#else + "and %[tmp0], %[tmp1], 0xff00ff00 \n\t" + "srl %[tmp0], %[tmp0], 8 \n\t" + "and %[tmp1], %[tmp1], 0x00ff00ff \n\t" + "sll %[tmp1], %[tmp1], 8 \n\t" + "or %[tmp1], %[tmp1], %[tmp0] \n\t" +#endif #endif PTR_SLL "%[tmp1], %[tmp1], 0x01 \n\t" PTR_SUBU "%[tmp1], %[tmp1], %[cabac_mask] \n\t"

1 0