August 2018 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/dnxhdenc: stop leaking memory when initalization fails
by Paul B Mahol 31 Aug '18

31 Aug '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Aug 30 11:35:07 2018 +0200| [aeb73c73e112130fe344529bebb71bca3d286cb9] | committer: Paul B Mahol avcodec/dnxhdenc: stop leaking memory when initalization fails Fixes #6593. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aeb73c73e112130fe… --- libavcodec/dnxhdenc.c | 18 +++++++++--------- libavcodec/dnxhdenc.h | 2 ++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 01e22e7764..5135eedfd6 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -207,17 +207,17 @@ static av_cold int dnxhd_init_vlc(DNXHDEncContext *ctx) int i, j, level, run; int max_level = 1 << (ctx->bit_depth + 2); - FF_ALLOCZ_ARRAY_OR_GOTO(ctx->m.avctx, ctx->vlc_codes, - max_level, 4 * sizeof(*ctx->vlc_codes), fail); - FF_ALLOCZ_ARRAY_OR_GOTO(ctx->m.avctx, ctx->vlc_bits, - max_level, 4 * sizeof(*ctx->vlc_bits), fail); + FF_ALLOCZ_ARRAY_OR_GOTO(ctx->m.avctx, ctx->orig_vlc_codes, + max_level, 4 * sizeof(*ctx->orig_vlc_codes), fail); + FF_ALLOCZ_ARRAY_OR_GOTO(ctx->m.avctx, ctx->orig_vlc_bits, + max_level, 4 * sizeof(*ctx->orig_vlc_bits), fail); FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->run_codes, 63 * 2, fail); FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->run_bits, 63, fail); - ctx->vlc_codes += max_level * 2; - ctx->vlc_bits += max_level * 2; + ctx->vlc_codes = ctx->orig_vlc_codes + max_level * 2; + ctx->vlc_bits = ctx->orig_vlc_bits + max_level * 2; for (level = -max_level; level < max_level; level++) { for (run = 0; run < 2; run++) { int index = (level << 1) | run; @@ -1348,11 +1348,10 @@ FF_ENABLE_DEPRECATION_WARNINGS static av_cold int dnxhd_encode_end(AVCodecContext *avctx) { DNXHDEncContext *ctx = avctx->priv_data; - int max_level = 1 << (ctx->bit_depth + 2); int i; - av_free(ctx->vlc_codes - max_level * 2); - av_free(ctx->vlc_bits - max_level * 2); + av_freep(&ctx->orig_vlc_codes); + av_freep(&ctx->orig_vlc_bits); av_freep(&ctx->run_codes); av_freep(&ctx->run_bits); @@ -1392,6 +1391,7 @@ AVCodec ff_dnxhd_encoder = { .encode2 = dnxhd_encode_picture, .close = dnxhd_encode_end, .capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV422P10, diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h index 963821ac81..7b0d862e28 100644 --- a/libavcodec/dnxhdenc.h +++ b/libavcodec/dnxhdenc.h @@ -86,6 +86,8 @@ typedef struct DNXHDEncContext { unsigned frame_bits; uint8_t *src[3]; + uint32_t *orig_vlc_codes; + uint8_t *orig_vlc_bits; uint32_t *vlc_codes; uint8_t *vlc_bits; uint16_t *run_codes;

1 0

fate: add 10-bit test for hue video filter
by Tobias Rapp 31 Aug '18

31 Aug '18

ffmpeg | branch: master | Tobias Rapp <t.rapp(a)noa-archive.com> | Fri Aug 3 11:29:50 2018 +0200| [56f68a099cc607658118e00cad30569103ae3751] | committer: Tobias Rapp fate: add 10-bit test for hue video filter Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Tobias Rapp <t.rapp(a)noa-archive.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56f68a099cc607658… --- tests/fate/filter-video.mak | 3 +++ tests/ref/fate/filter-hue4 | 1 + 2 files changed, 4 insertions(+) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index edd51e1515..8bbdc04896 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -514,6 +514,9 @@ fate-filter-hue2: CMD = video_filter "perms=random,hue=h=18*n" -frames:v 20 FATE_FILTER_VSYNTH-$(call ALLYES, PERMS_FILTER HUE_FILTER) += fate-filter-hue3 fate-filter-hue3: CMD = video_filter "perms=random,hue=b=n-10" -frames:v 20 +FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER PERMS_FILTER HUE_FILTER) += fate-filter-hue4 +fate-filter-hue4: CMD = video_filter "format=yuv422p10,perms=random,hue=h=18*n:s=n/10" -frames:v 20 -pix_fmt yuv422p10le + FATE_FILTER_VSYNTH-$(CONFIG_IDET_FILTER) += fate-filter-idet fate-filter-idet: CMD = framecrc -flags bitexact -idct simple -i $(SRC) -vf idet -frames:v 25 -flags +bitexact diff --git a/tests/ref/fate/filter-hue4 b/tests/ref/fate/filter-hue4 new file mode 100644 index 0000000000..2a08c33314 --- /dev/null +++ b/tests/ref/fate/filter-hue4 @@ -0,0 +1 @@ +hue4 6279ed43527e7b5be645819e08880107

1 0

lavc/pthread: use THREAD_SAFE_CALLBACKS() to simplifx more code
by Jun Zhao 31 Aug '18

31 Aug '18

ffmpeg | branch: master | Jun Zhao <mypopydev(a)gmail.com> | Sat Aug 11 17:15:39 2018 +0800| [3ad0e6724de836a9bf996942490d6d9146873188] | committer: Jun Zhao lavc/pthread: use THREAD_SAFE_CALLBACKS() to simplifx more code use THREAD_SAFE_CALLBACKS() to simplifx more code Signed-off-by: Jun Zhao <mypopydev(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ad0e6724de836a9b… --- libavcodec/pthread_frame.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 5104b1beba..36ac0ac1e5 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -908,8 +908,7 @@ static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int } pthread_mutex_lock(&p->parent->buffer_mutex); - if (avctx->thread_safe_callbacks || - avctx->get_buffer2 == avcodec_default_get_buffer2) { + if (THREAD_SAFE_CALLBACKS(avctx)) { err = ff_get_buffer(avctx, f->f, flags); } else { pthread_mutex_lock(&p->progress_mutex); @@ -976,8 +975,7 @@ void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f) FrameThreadContext *fctx; AVFrame *dst, *tmp; int can_direct_free = !(avctx->active_thread_type & FF_THREAD_FRAME) || - avctx->thread_safe_callbacks || - avctx->get_buffer2 == avcodec_default_get_buffer2; + THREAD_SAFE_CALLBACKS(avctx); if (!f->f || !f->f->buf[0]) return;

1 0

configure: <fflib>_deps: validate, reduce sensitivity
by Avi Halachmi (:avih) 31 Aug '18

31 Aug '18

ffmpeg | branch: master | Avi Halachmi (:avih) <avihpit(a)yahoo.com> | Tue Aug 28 17:14:55 2018 +0300| [09e49a8fb082486180de28f46c47fdc2179504be] | committer: Michael Niedermayer configure: <fflib>_deps: validate, reduce sensitivity - Allow to add deps in any order rather than "in linking order". - Expand deps chains as required rather than just once. - Validate that there are no cycles. - Validate that [after expansion] deps are limited to other fflibs. - Remove expectation for a specific output order of unique(). Previously when adding items to <fflib>_deps, developers were required to add them in linking order. This can be awkward and bug-prone, especially when a list is not empty, e.g. when adding conditional deps. It also implicitly expected unique() to keep the last instance of recurring items such that these lists maintain their linking order after removing duplicate items. This patch mainly allows to add deps in any order by keeping just one master list in linking order, and then reordering all the <fflib>_deps lists to align with the master list order. This master list is LIBRARY_LIST itself, where otherwise its order doesn't matter. The patch also removes a limit where these deps lists were expanded only once. This could have resulted in incomplete expanded lists, or forcing devs to add already-deducable deps to avoid this issue. Note: it is possible to deduce the master list order automatically from the deps lists, but in this case it's probably not worth the added complexity, even if minor. Maintaining one list should be OK. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09e49a8fb08248618… --- configure | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 3cf9412947..8bbcd530c7 100755 --- a/configure +++ b/configure @@ -1818,16 +1818,17 @@ FEATURE_LIST=" swscale_alpha " +# this list should be kept in linking order LIBRARY_LIST=" - avcodec avdevice avfilter + swscale + postproc avformat + avcodec + swresample avresample avutil - postproc - swresample - swscale " LICENSE_LIST=" @@ -3491,7 +3492,7 @@ vaapi_transcode_example_deps="avcodec avformat avutil h264_vaapi_encoder" cpu_init_extralibs="pthreads_extralibs" cws2fws_extralibs="zlib_extralibs" -# libraries, in linking order +# libraries, in any order avcodec_deps="avutil" avcodec_suggest="libm" avcodec_select="null_bsf" @@ -6846,7 +6847,7 @@ done enabled zlib && add_cppflags -DZLIB_CONST -# conditional library dependencies, in linking order +# conditional library dependencies, in any order enabled afftfilt_filter && prepend avfilter_deps "avcodec" enabled afir_filter && prepend avfilter_deps "avcodec" enabled amovie_filter && prepend avfilter_deps "avformat avcodec" @@ -6889,11 +6890,36 @@ enabled sdl2_outdev && add_cflags $(filter_out '-Dmain=SDL_main' $sdl2_cflag enabled opus_decoder && prepend avcodec_deps "swresample" +# reorder the items at var $1 to align with the items order at var $2 . +# die if an item at $1 is not at $2 . +reorder_by(){ + eval rb_in=\$$1 + eval rb_ordered=\$$2 + + for rb in $rb_in; do + is_in $rb $rb_ordered || die "$rb at \$$1 is not at \$$2" + done + + rb_out= + for rb in $rb_ordered; do + is_in $rb $rb_in && rb_out="$rb_out$rb " + done + eval $1=\$rb_out +} + +# deps-expand fflib $1: N x {append all expanded deps; unique} +# within a set of N items, N expansions are enough to expose a cycle. expand_deps(){ - lib_deps=${1}_deps - eval "deps=\$$lib_deps" - append $lib_deps $(map 'eval echo \$${v}_deps' $deps) - unique $lib_deps + unique ${1}_deps # required for the early break test. + for dummy in $LIBRARY_LIST; do # N iteratios + eval deps=\$${1}_deps + append ${1}_deps $(map 'eval echo \$${v}_deps' $deps) + unique ${1}_deps + eval '[ ${#deps} = ${#'${1}_deps'} ]' && break # doesn't expand anymore + done + + eval is_in $1 \$${1}_deps && die "Dependency cycle at ${1}_deps" + reorder_by ${1}_deps LIBRARY_LIST # linking order is expected later } #we have to remove gpl from the deps here as some code assumes all lib deps are libs

1 0

tests/ref/fate/pixelutils: Add a newline.
by Carl Eugen Hoyos 31 Aug '18

31 Aug '18

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Wed Aug 29 23:26:01 2018 +0200| [cffbeda4621b0e153016815f35a880061dfa6965] | committer: Carl Eugen Hoyos tests/ref/fate/pixelutils: Add a newline. Fixes fate-pixelutils on aix. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cffbeda4621b0e153… --- tests/ref/fate/pixelutils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ref/fate/pixelutils b/tests/ref/fate/pixelutils index 434904e477..df72d52e69 100644 --- a/tests/ref/fate/pixelutils +++ b/tests/ref/fate/pixelutils @@ -57,4 +57,4 @@ [OK] [AA] SAD [small] 16x16=22986 ref=22986 [OK] [UU] SAD [small] 32x32=86550 ref=86550 [OK] [AU] SAD [small] 32x32=83656 ref=83656 -[OK] [AA] SAD [small] 32x32=85164 ref=85164 \ No newline at end of file +[OK] [AA] SAD [small] 32x32=85164 ref=85164

1 0

lavc/v4l2_m2m_enc: Add missing braces around initializers.
by Carl Eugen Hoyos 31 Aug '18

31 Aug '18

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Fri Aug 31 00:43:17 2018 +0200| [6dbb64fdccafe846aaec75d3784f7ad49d8af5df] | committer: Carl Eugen Hoyos lavc/v4l2_m2m_enc: Add missing braces around initializers. Fixes the following warnings: libavcodec/v4l2_m2m_enc.c:51:12: warning: missing braces around initializer libavcodec/v4l2_m2m_enc.c:71:12: warning: missing braces around initializer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6dbb64fdccafe846a… --- libavcodec/v4l2_m2m_enc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 4c9ea1fd92..636e1a96dd 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -48,7 +48,7 @@ static inline void v4l2_set_timeperframe(V4L2m2mContext *s, unsigned int num, un static inline void v4l2_set_ext_ctrl(V4L2m2mContext *s, unsigned int id, signed int value, const char *name) { - struct v4l2_ext_controls ctrls = { 0 }; + struct v4l2_ext_controls ctrls = { { 0 } }; struct v4l2_ext_control ctrl = { 0 }; /* set ctrls */ @@ -68,7 +68,7 @@ static inline void v4l2_set_ext_ctrl(V4L2m2mContext *s, unsigned int id, signed static inline int v4l2_get_ext_ctrl(V4L2m2mContext *s, unsigned int id, signed int *value, const char *name) { - struct v4l2_ext_controls ctrls = { 0 }; + struct v4l2_ext_controls ctrls = { { 0 } }; struct v4l2_ext_control ctrl = { 0 }; int ret;

1 0

avcodec/get_bits: actually make cached reader correctly disabled
by James Almer 30 Aug '18

30 Aug '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Thu Aug 30 22:36:55 2018 +0200| [9305bdc68f0976e0c5870f0d0557a45fe13bb0f6] | committer: Paul B Mahol avcodec/get_bits: actually make cached reader correctly disabled > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9305bdc68f0976e0c… --- libavcodec/get_bits.h | 40 ++++++++++++++++++++++------------------ libavcodec/golomb.h | 14 +++++++------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 58ebb64656..26a5b3e54f 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -54,9 +54,13 @@ #define UNCHECKED_BITSTREAM_READER !CONFIG_SAFE_BITSTREAM_READER #endif +#ifndef CACHED_BITSTREAM_READER +#define CACHED_BITSTREAM_READER 0 +#endif + typedef struct GetBitContext { const uint8_t *buffer, *buffer_end; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER uint64_t cache; unsigned bits_left; #endif @@ -116,7 +120,7 @@ static inline unsigned int show_bits(GetBitContext *s, int n); * For examples see get_bits, show_bits, skip_bits, get_vlc. */ -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER # define MIN_CACHE_BITS 64 #elif defined LONG_BITSTREAM_READER # define MIN_CACHE_BITS 32 @@ -124,7 +128,7 @@ static inline unsigned int show_bits(GetBitContext *s, int n); # define MIN_CACHE_BITS 25 #endif -#ifndef CACHED_BITSTREAM_READER +#if !CACHED_BITSTREAM_READER #define OPEN_READER_NOSIZE(name, gb) \ unsigned int name ## _index = (gb)->index; \ @@ -214,14 +218,14 @@ static inline unsigned int show_bits(GetBitContext *s, int n); static inline int get_bits_count(const GetBitContext *s) { -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER return s->index - s->bits_left; #else return s->index; #endif } -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER static inline void refill_32(GetBitContext *s) { #if !UNCHECKED_BITSTREAM_READER @@ -288,7 +292,7 @@ static inline unsigned show_val(const GetBitContext *s, unsigned n) */ static inline void skip_bits_long(GetBitContext *s, int n) { -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER skip_bits(s, n); #else #if UNCHECKED_BITSTREAM_READER @@ -299,7 +303,7 @@ static inline void skip_bits_long(GetBitContext *s, int n) #endif } -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER static inline void skip_remaining(GetBitContext *s, unsigned n) { #ifdef BITSTREAM_READER_LE @@ -318,7 +322,7 @@ static inline void skip_remaining(GetBitContext *s, unsigned n) */ static inline int get_xbits(GetBitContext *s, int n) { -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER int32_t cache = show_bits(s, 32); int sign = ~cache >> 31; skip_remaining(s, n); @@ -338,7 +342,7 @@ static inline int get_xbits(GetBitContext *s, int n) #endif } -#ifndef CACHED_BITSTREAM_READER +#if !CACHED_BITSTREAM_READER static inline int get_xbits_le(GetBitContext *s, int n) { register int sign; @@ -357,7 +361,7 @@ static inline int get_xbits_le(GetBitContext *s, int n) static inline int get_sbits(GetBitContext *s, int n) { register int tmp; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER av_assert2(n>0 && n<=25); tmp = sign_extend(get_bits(s, n), n); #else @@ -377,7 +381,7 @@ static inline int get_sbits(GetBitContext *s, int n) static inline unsigned int get_bits(GetBitContext *s, int n) { register int tmp; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER av_assert2(n>0 && n<=32); if (n > s->bits_left) { @@ -412,7 +416,7 @@ static av_always_inline int get_bitsz(GetBitContext *s, int n) static inline unsigned int get_bits_le(GetBitContext *s, int n) { -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER av_assert2(n>0 && n<=32); if (n > s->bits_left) { refill_32(s); @@ -439,7 +443,7 @@ static inline unsigned int get_bits_le(GetBitContext *s, int n) static inline unsigned int show_bits(GetBitContext *s, int n) { register int tmp; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER if (n > s->bits_left) refill_32(s); @@ -455,7 +459,7 @@ static inline unsigned int show_bits(GetBitContext *s, int n) static inline void skip_bits(GetBitContext *s, int n) { -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER if (n < s->bits_left) skip_remaining(s, n); else { @@ -482,7 +486,7 @@ static inline void skip_bits(GetBitContext *s, int n) static inline unsigned int get_bits1(GetBitContext *s) { -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER if (!s->bits_left) refill_64(s); @@ -529,7 +533,7 @@ static inline unsigned int get_bits_long(GetBitContext *s, int n) av_assert2(n>=0 && n<=32); if (!n) { return 0; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER } return get_bits(s, n); #else @@ -628,7 +632,7 @@ static inline int init_get_bits(GetBitContext *s, const uint8_t *buffer, s->buffer_end = buffer + buffer_size; s->index = 0; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER refill_64(s); #endif @@ -758,7 +762,7 @@ static inline int set_idx(GetBitContext *s, int code, int *n, int *nb_bits, static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2], int bits, int max_depth) { -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER int nb_bits; unsigned idx = show_bits(s, bits); int code = table[idx][0]; diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index e66675b292..5c25883626 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -54,7 +54,7 @@ static inline int get_ue_golomb(GetBitContext *gb) { unsigned int buf; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER buf = show_bits_long(gb, 32); if (buf >= (1 << 27)) { @@ -119,7 +119,7 @@ static inline int get_ue_golomb_31(GetBitContext *gb) { unsigned int buf; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER buf = show_bits_long(gb, 32); buf >>= 32 - 9; @@ -142,7 +142,7 @@ static inline unsigned get_interleaved_ue_golomb(GetBitContext *gb) { uint32_t buf; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER buf = show_bits_long(gb, 32); if (buf & 0xAA800000) { @@ -238,7 +238,7 @@ static inline int get_se_golomb(GetBitContext *gb) { unsigned int buf; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER buf = show_bits_long(gb, 32); if (buf >= (1 << 27)) { @@ -300,7 +300,7 @@ static inline int get_interleaved_se_golomb(GetBitContext *gb) { unsigned int buf; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER buf = show_bits_long(gb, 32); if (buf & 0xAA800000) { @@ -375,7 +375,7 @@ static inline int get_ur_golomb(GetBitContext *gb, int k, int limit, unsigned int buf; int log; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER buf = show_bits_long(gb, 32); log = av_log2(buf); @@ -429,7 +429,7 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, unsigned int buf; int log; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER buf = show_bits_long(gb, 32); log = av_log2(buf);

1 0

avfilter/vf_frei0r: Remove duplicate }, fix build
by Michael Niedermayer 30 Aug '18

30 Aug '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Aug 30 17:09:23 2018 +0200| [6b1b5af0240b24274f52963a2bac0f9a6d78304a] | committer: Michael Niedermayer avfilter/vf_frei0r: Remove duplicate }, fix build Fixes regression from a3c6b7ff5903b8a044e30edaaa0de00e70517538 Reported-by: qq2225936589 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b1b5af0240b24274… --- libavfilter/vf_frei0r.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index 67b2f374c3..c775ed1d99 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -125,7 +125,6 @@ static int set_param(AVFilterContext *ctx, f0r_param_info_t info, int index, cha if (sscanf(param, "%lf/%lf", &val.pos.x, &val.pos.y) != 2) goto fail; break; - } case F0R_PARAM_STRING: val.str = param;

1 0

avcodec/utvideodec: use cached bitstream reader everywhere except on x86_32
by Paul B Mahol 30 Aug '18

30 Aug '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Apr 3 13:32:07 2018 +0200| [562f00ed072080b34f351577818783a94ac9de62] | committer: Paul B Mahol avcodec/utvideodec: use cached bitstream reader everywhere except on x86_32 >From 100x real-time decoding to 138x real-time decoding for 320x240 video. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=562f00ed072080b34… --- libavcodec/utvideodec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index 82cb038ccd..3891df3570 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -27,6 +27,7 @@ #include <inttypes.h> #include <stdlib.h> +#define CACHED_BITSTREAM_READER !ARCH_X86_32 #define UNCHECKED_BITSTREAM_READER 1 #include "libavutil/intreadwrite.h"

1 0

doc/libav-merge: bitstream reader is now merged
by Paul B Mahol 30 Aug '18

30 Aug '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jul 7 20:47:08 2017 +0200| [042fc12344d6b86dceab114710d1f19442087df5] | committer: Paul B Mahol doc/libav-merge: bitstream reader is now merged Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=042fc12344d6b86dc… --- doc/libav-merge.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 8c182ae78d..d5e671ca55 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -95,7 +95,6 @@ Stuff that didn't reach the codebase: - 0cef06df0 checkasm: add HEVC MC tests - e7078e842 hevcdsp: add x86 SIMD for MC - 7993ec19a hevc: Add hevc_get_pixel_4/8/12/16/24/32/48/64 -- new bitstream reader (see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html) - use av_cpu_max_align() instead of hardcoding alignment requirements (see https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html) - f44ec22e0 lavc: use av_cpu_max_align() instead of hardcoding alignment requirements - 4de220d2e frame: allow align=0 (meaning automatic) for av_frame_get_buffer()

1 0