gmane.comp.video.libav.devel
http://blog.gmane.org/gmane.comp.video.libav.devel
hourly
1
1901-01-01T00:00+00:00
Gmane
http://gmane.org/img/gmane-25t.png
http://gmane.org
-
[PATCH] fate.sh: add support for build-only FATEinstances
http://comments.gmane.org/gmane.comp.video.libav.devel/46244
<pre>From: Diego Biurrun <diego-NvuzD6AdJSiELgA04lAiVw< at >public.gmane.org>
If the "build_only" variable is set in the configuration file, the
FATE client will skip running tests and just compile all targets.
---
doc/fate.texi | 1 +
tests/fate.sh | 1 +
2 files changed, 2 insertions(+)
diff --git a/doc/fate.texi b/doc/fate.texi
index bc6ab3e..f076acd 100644
--- a/doc/fate.texi
+++ b/doc/fate.texi
< at >< at > -120,6 +120,7 < at >< at > samples=/path/to/fate/samples
workdir= # directory in which to do all the work
fate_recv="ssh -T fate< at >< at >fate.libav.org" # command to submit report
comment= # optional description
+build_only= # set to "yes" for a compile-only instance that skips tests
# the following are optional and map to configure options
arch=
diff --git a/tests/fate.sh b/tests/fate.sh
index 86e4178..d2bc178 100755
--- a/tests/fate.sh
+++ b/tests/fate.sh
< at >< at > -66,6 +66,7 < at >< at > compile()(
)
fate()(
+ test "$build_only" = "yes" && return
cd ${build} || return
${make} ${makeopts} -k fate
)
</pre>
Martin Storsjö
2013-05-20T08:36:46
-
[PATCH 1/2] fate: Don't use files from SRC_PATH inthe actual tests
http://comments.gmane.org/gmane.comp.video.libav.devel/46242
<pre>If building out of tree, make sure the filter scripts are copied
into the build tree before running tests. This makes sure that
SRC_PATH doesn't need to exist on the remote system (or doesn't
need to exist at the same path).
---
tests/Makefile | 10 ++++++++--
tests/fate/filter-audio.mak | 3 ++-
tests/fate/filter-video.mak | 6 ++++--
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/tests/Makefile b/tests/Makefile
index 7525243..539526f 100644
--- a/tests/Makefile
+++ b/tests/Makefile
< at >< at > -1,7 +1,7 < at >< at >
VREF = tests/vsynth1/00.pgm
AREF = tests/data/asynth1.sw
-OBJDIRS += tests/data tests/vsynth1
+OBJDIRS += tests/data tests/vsynth1 tests/filtergraphs
$(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1
$(M)./$< 'tests/vsynth1/'
< at >< at > -20,6 +20,12 < at >< at > tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data
tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm: TAG = GEN
+ifneq ($(SRC_PATH), .)
+tests/filtergraphs/%: TAG = COPY
+tests/filtergraphs/%: $(SRC_PATH)/tests/filtergraphs/% | tests/filtergraphs
+$(M) cp $< $< at >
+endif
+
CHKCFG = $(if $($(1))$(!$(1)),$($(1)), $(if $(ALLOW_MISSING_CONFIG), , $(error No such config: $(1))))
ALLYES = $(strip $(call XYES, $(1)))
< at >< at > -145,7 +151,7 < at >< at > lcov-reset:
clean:: testclean
testclean:
-$(RM) -r tests/vsynth1 tests/data
+$(RM) -r tests/vsynth1 tests/data tests/filtergraphs
$(RM) $(CLEANSUFFIXES:%=tests/%)
$(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF))
diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak
index ac025c4..6e486a1 100644
--- a/tests/fate/filter-audio.mak
+++ b/tests/fate/filter-audio.mak
< at >< at > -42,9 +42,10 < at >< at > $(FATE_ATRIM): SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
FATE_FILTER-$(call FILTERDEMDECENCMUX, ATRIM, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_ATRIM)
FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-channelmap
+fate-filter-channelmap: tests/filtergraphs/channelmap
fate-filter-channelmap: SRC = $(TARGET_PATH)/tests/data/asynth-44100-6.wav
fate-filter-channelmap: tests/data/asynth-44100-6.wav
-fate-filter-channelmap: CMD = md5 -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/channelmap -f wav -flags +bitexact
+fate-filter-channelmap: CMD = md5 -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/filtergraphs/channelmap -f wav -flags +bitexact
fate-filter-channelmap: CMP = oneline
fate-filter-channelmap: REF = 21f1977c4f9705e2057083f84764e685
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
index f4e813c..54e8b89 100644
--- a/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
< at >< at > -34,10 +34,12 < at >< at > FATE_FILTER_VSYNTH-$(CONFIG_NEGATE_FILTER) += fate-filter-negate
fate-filter-negate: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf negate
FATE_FILTER_VSYNTH-$(CONFIG_OVERLAY_FILTER) += fate-filter-overlay
-fate-filter-overlay: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay
+fate-filter-overlay: tests/filtergraphs/overlay
+fate-filter-overlay: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/filtergraphs/overlay
FATE_FILTER_VSYNTH-$(call ALLYES, SETPTS_FILTER SETTB_FILTER) += fate-filter-setpts
-fate-filter-setpts: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(SRC_PATH)/tests/filtergraphs/setpts
+fate-filter-setpts: tests/filtergraphs/setpts
+fate-filter-setpts: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(TARGET_PATH)/tests/filtergraphs/setpts
FATE_FILTER_VSYNTH-$(CONFIG_TRANSPOSE_FILTER) += fate-filter-transpose
fate-filter-transpose: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf transpose
</pre>
Martin Storsjö
2013-05-20T08:33:21
-
Using AVFormatContext to decode a file - memory leakwhen using avcodec_copy_context
http://comments.gmane.org/gmane.comp.video.libav.devel/46239
<pre>Hi,
Last couple of days I've been working on a video player using libav. And
because there is no
clean example of how to use AVFormatContext to demux a video file and
process the
frames I've based my code on talks in #libav-devel, the api-example.c and
code I found
when googling.
After being advised to copy the AVCodecContext from the video stream found
in AVFormatContext.streams,
I got a memory leak when closing/free-ing the AVCodecContext. I'm copying
the codec context like this:
https://gist.github.com/roxlu/ed76cd1465bc1cdb16b1#file-avdecoder-cpp-L107-L118
After diving into the source code of libav, I saw that avcodec_copy_context
copies the extradata, but
only frees it when it's an encoder. See the related code here:
https://gist.github.com/roxlu/5f0bbed4da1a52c971c4#file-utils-c-L1464-L1465
The documentation of avcodec_close says:
*"Close a given AVCodecContext and free all the data associated with it
(but not the AVCodecContext itself)."*
*
*
< at >nevcairiel told me that the source code tells otherwise and that you need
to free the extradata manually:
"** - decoding: Set/allocated/freed by user."*.
Therefore I changed my code and freed the extradata manually. Sadly this
didn't fix the memory leak.
I did found a workaround by manually allocating an AVCodecContext and
copying/freeing the extradata
myself. I'm not having a memory leak anymore, but I'm still curious if
it's a bug in libav or my code.
Thanks,
roxlu
</pre>
Diederick Huijbers ☾
2013-05-19T13:15:58
-
[PATCH] make: Allow ignoring missing config variables
http://comments.gmane.org/gmane.comp.video.libav.devel/46237
<pre>If upgrading an older build config, where newly added e.g.
decoders aren't present, to a newer git version where fate tests
exist that have dependencies declared on this codec, all make
invocations error out with "No such config: CONFIG_NEW_DECODER".
This is an intended feature to make sure that fate test
dependencies actually refer to existing config items.
In cases where upgrading an old build (and reconfiguring with
"make config"), this is an inconvenience. With this patch in
place, the caller can ignore these missing dependencies
by setting ALLOW_MISSING_CONFIG=1 during that call.
---
tests/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/Makefile b/tests/Makefile
index 939490b..7525243 100644
--- a/tests/Makefile
+++ b/tests/Makefile
< at >< at > -20,7 +20,7 < at >< at > tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data
tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm: TAG = GEN
-CHKCFG = $(if $($(1))$(!$(1)),$($(1)), $(error No such config: $(1)))
+CHKCFG = $(if $($(1))$(!$(1)),$($(1)), $(if $(ALLOW_MISSING_CONFIG), , $(error No such config: $(1))))
ALLYES = $(strip $(call XYES, $(1)))
XYES = $(if $(strip $(1)), \
</pre>
Martin Storsjö
2013-05-19T20:38:31
-
Small vorbis cleanup
http://comments.gmane.org/gmane.comp.video.libav.devel/46226
<pre>A small set to get rid of the assert.
</pre>
Luca Barbato
2013-05-19T17:41:12
-
[PATCH 1/1] mpegvideo: unref old current_picturebefore allocating a new one
http://comments.gmane.org/gmane.comp.video.libav.devel/46224
<pre>Allows decoding with only three frame buffers with frame reference
counting. Fixes VAAPI based decoding in vlc which uses only three
frame buffers for the mpegvideo-based codecs.
---
libavcodec/mpegvideo.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index b5f1587..b175d32 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
< at >< at > -1495,6 +1495,8 < at >< at > int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
}
}
+ ff_mpeg_unref_picture(s, &s->current_picture);
+
if (!s->encoding) {
ff_release_unused_pictures(s, 1);
< at >< at > -1542,7 +1544,6 < at >< at > int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
// s->current_picture_ptr->quality = s->new_picture_ptr->quality;
s->current_picture_ptr->f.key_frame = s->pict_type == AV_PICTURE_TYPE_I;
- ff_mpeg_unref_picture(s, &s->current_picture);
if ((ret = ff_mpeg_ref_picture(s, &s->current_picture,
s->current_picture_ptr)) < 0)
return ret;
</pre>
Janne Grunau
2013-05-19T13:34:05
-
Invitation to connect on LinkedIn
http://comments.gmane.org/gmane.comp.video.libav.devel/46222
<pre>LinkedIn
------------
I'd like to add you to my professional network on LinkedIn.
- Stas
Stas Oskin
CTO at eyecam
Israel
Confirm that you know Stas Oskin:
https://www.linkedin.com/e/-yb2raf-hgvy7mzc-3g/isd/13394342437/xQzhK2aL/?hs=false&tok=1IeN9i3otJ95M1
--
You are receiving Invitation to Connect emails. Click to unsubscribe:
http://www.linkedin.com/e/-yb2raf-hgvy7mzc-3g/qxBs_HW79xfhyWpS4lsvpOW79xfh3Ctvi6/goo/libav-devel%40libav%2Eorg/20061/I4437374796_1/?hs=false&tok=2VIIHII4hJ95M1
(c) 2012 LinkedIn Corporation. 2029 Stierlin Ct, Mountain View, CA 94043, USA.
</pre>
Stas Oskin
2013-05-19T08:13:41
-
[PATCH 1/2] configure: Add basic valgrind-massifsupport
http://comments.gmane.org/gmane.comp.video.libav.devel/46219
<pre>With the parameter --valgrind-massif, the configure script sets
reasonable defaults that can be overridden as explained in
the documentation.
---
configure | 4 ++++
doc/developer.texi | 7 ++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 94804bd..f39a860 100755
--- a/configure
+++ b/configure
< at >< at > -2211,6 +2211,10 < at >< at > case "$toolchain" in
add_cflags -fsanitize=thread -pie
add_ldflags -fsanitize=thread -pie
;;
+ valgrind-massif)
+ target_exec_default="valgrind"
+ target_exec_args="--alloc-fn=av_malloc --alloc-fn=av_mallocz"
+ ;;
valgrind-memcheck)
target_exec_default="valgrind"
target_exec_args="--track-origins=yes --leak-check=full"
diff --git a/doc/developer.texi b/doc/developer.texi
index c3d0f20..58635f8 100644
--- a/doc/developer.texi
+++ b/doc/developer.texi
< at >< at > -578,9 +578,10 < at >< at > new test.
The configure script provides a shortcut for using valgrind to spot bugs
related to memory handling. Just add the option
-< at >code{--toolchain=valgrind-memcheck} to your configure line, and
-reasonable defaults will be set for running FATE under the supervision
-of the < at >strong{memcheck} tool of the valgrind suite.
+< at >code{--toolchain=valgrind-memcheck} or < at >code{--toolchain=valgrind-massif}
+to your configure line, and reasonable defaults will be set for running
+FATE under the supervision of either the < at >strong{memcheck} or the
+< at >strong{massif} tool of the valgrind suite.
In case you need finer control over how valgrind is invoked, use the
< at >code{--target-exec='valgrind <your_custom_valgrind_options>} option in
</pre>
Luca Barbato
2013-05-18T18:44:22
-
[PATCH 1/3] wavpack: K&R formatting cosmetics
http://comments.gmane.org/gmane.comp.video.libav.devel/46209
<pre>---
Leftover from the previous set.
libavcodec/wavpack.c | 45 ++++++++++++++++++++++++++++++---------------
1 file changed, 30 insertions(+), 15 deletions(-)
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 37e8768..c74901d 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
< at >< at > -406,7 +406,8 < at >< at > static inline int wv_get_value_integer(WavpackFrameContext *s, uint32_t *crc,
if (s->extra_bits){
S <<= s->extra_bits;
- if (s->got_extra_bits && get_bits_left(&s->gb_extra_bits) >= s->extra_bits) {
+ if (s->got_extra_bits &&
+ get_bits_left(&s->gb_extra_bits) >= s->extra_bits) {
S |= get_bits(&s->gb_extra_bits, s->extra_bits);
*crc = *crc * 9 + (S & 0xffff) * 3 + ((unsigned)S >> 16);
}
< at >< at > -460,7 +461,8 < at >< at > static float wv_get_value_float(WavpackFrameContext *s, uint32_t *crc, int S)
if (shift) {
S <<= shift;
if ((s->float_flag & WV_FLT_SHIFT_ONES) ||
- (s->got_extra_bits && (s->float_flag & WV_FLT_SHIFT_SAME) &&
+ (s->got_extra_bits &&
+ (s->float_flag & WV_FLT_SHIFT_SAME) &&
get_bits1(&s->gb_extra_bits))) {
S |= (1 << shift) - 1;
} else if (s->got_extra_bits &&
< at >< at > -780,7 +782,8 < at >< at > static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
s = wc->fdec[block_no];
if (!s) {
- av_log(avctx, AV_LOG_ERROR, "Context for block %d is not present\n", block_no);
+ av_log(avctx, AV_LOG_ERROR, "Context for block %d is not present\n",
+ block_no);
return -1;
}
< at >< at > -831,11 +834,15 < at >< at > static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
if (id & WP_IDF_ODD)
size--;
if (size < 0) {
- av_log(avctx, AV_LOG_ERROR, "Got incorrect block %02X with size %i\n", id, size);
+ av_log(avctx, AV_LOG_ERROR,
+ "Got incorrect block %02X with size %i\n",
+ id, size);
break;
}
if (buf + ssize > buf_end) {
- av_log(avctx, AV_LOG_ERROR, "Block size %i is out of bounds\n", size);
+ av_log(avctx, AV_LOG_ERROR,
+ "Block size %i is out of bounds\n",
+ size);
break;
}
if (id & WP_IDF_IGNORE) {
< at >< at > -919,8 +926,9 < at >< at > static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
break;
case WP_ID_ENTROPY:
if (size != 6 * (s->stereo_in + 1)) {
- av_log(avctx, AV_LOG_ERROR, "Entropy vars size should be %i, "
- "got %i", 6 * (s->stereo_in + 1), size);
+ av_log(avctx, AV_LOG_ERROR,
+ "Entropy vars size should be %i, got %i",
+ 6 * (s->stereo_in + 1), size);
buf += ssize;
continue;
}
< at >< at > -958,7 +966,9 < at >< at > static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
break;
case WP_ID_INT32INFO:
if (size != 4) {
- av_log(avctx, AV_LOG_ERROR, "Invalid INT32INFO, size = %i, sent_bits = %i\n", size, *buf);
+ av_log(avctx, AV_LOG_ERROR,
+ "Invalid INT32INFO, size = %i, sent_bits = %i\n",
+ size, *buf);
buf += ssize;
continue;
}
< at >< at > -986,7 +996,9 < at >< at > static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
break;
case WP_ID_FLOATINFO:
if (size != 4) {
- av_log(avctx, AV_LOG_ERROR, "Invalid FLOATINFO, size = %i\n", size);
+ av_log(avctx, AV_LOG_ERROR,
+ "Invalid FLOATINFO, size = %i\n",
+ size);
buf += ssize;
continue;
}
< at >< at > -1020,7 +1032,8 < at >< at > static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
break;
case WP_ID_CHANINFO:
if (size <= 1) {
- av_log(avctx, AV_LOG_ERROR, "Insufficient channel information\n");
+ av_log(avctx, AV_LOG_ERROR,
+ "Insufficient channel information\n");
return -1;
}
chan = *buf++;
< at >< at > -1040,9 +1053,10 < at >< at > static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
chmask = avctx->channel_layout;
}
if (chan != avctx->channels) {
- av_log(avctx, AV_LOG_ERROR, "Block reports total %d channels, "
- "decoder believes it's %d channels\n", chan,
- avctx->channels);
+ av_log(avctx, AV_LOG_ERROR,
+ "Block reports total %d channels, "
+ "decoder believes it's %d channels\n",
+ chan, avctx->channels);
return -1;
}
if (!avctx->channel_layout)
< at >< at > -1223,8 +1237,9 < at >< at > static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
}
}
if (frame_size < 0 || frame_size > buf_size) {
- av_log(avctx, AV_LOG_ERROR, "Block %d has invalid size (size %d "
- "vs. %d bytes left)\n", s->block, frame_size, buf_size);
+ av_log(avctx, AV_LOG_ERROR,
+ "Block %d has invalid size (size %d vs. %d bytes left)\n",
+ s->block, frame_size, buf_size);
wavpack_decode_flush(avctx);
return -1;
}
--
1.8.2.1
</pre>
Luca Barbato
2013-05-18T14:02:47
-
[RFC] vorbis: drop a (dis)optimization and relativeassert
http://comments.gmane.org/gmane.comp.video.libav.devel/46208
<pre>On recent hardware and compiler using a plain division is faster.
---
Some numbers using gcc-4.8 in -Og mode.
avconv
1399640 decicycles in vorbis, 2048 runs, 0 skips
avconv-div
1385903 decicycles in vorbis, 2048 runs, 0 skips
avconv
1422062 decicycles in vorbis, 2048 runs, 0 skips
avconv-div
1393888 decicycles in vorbis, 2048 runs, 0 skips
avconv
1420744 decicycles in vorbis, 2048 runs, 0 skips
avconv-div
1389816 decicycles in vorbis, 2048 runs, 0 skips
avconv
1398754 decicycles in vorbis, 2048 runs, 0 skips
avconv-div
1384642 decicycles in vorbis, 2048 runs, 0 skips
avconv
1408228 decicycles in vorbis, 2048 runs, 0 skips
avconv-div
1402553 decicycles in vorbis, 2048 runs, 0 skips
avconv
1404719 decicycles in vorbis, 2048 runs, 0 skips
avconv-div
1400232 decicycles in vorbis, 2048 runs, 0 skips
libavcodec/vorbisdec.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index 03c80b4..35e2242 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
< at >< at > -42,9 +42,6 < at >< at >
#define V_MAX_VLCS (1 << 16)
#define V_MAX_PARTITIONS (1 << 20)
-#undef NDEBUG
-#include <assert.h>
-
typedef struct {
uint8_t dimensions;
uint8_t lookup_type;
< at >< at > -1345,7 +1342,6 < at >< at > static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc,
voffset = vr->begin;
for (partition_count = 0; partition_count < ptns_to_read;) { // SPEC error
if (!pass) {
- unsigned inverse_class = ff_inverse[vr->classifications];
for (j_times_ptns_to_read = 0, j = 0; j < ch_used; ++j) {
if (!do_not_decode[j]) {
unsigned temp = get_vlc2(gb, vc->codebooks[vr->classbook].vlc.table,
< at >< at > -1353,11 +1349,9 < at >< at > static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc,
av_dlog(NULL, "Classword: %u\n", temp);
- assert(vr->classifications > 1 && temp <= 65536); //needed for inverse[]
for (i = 0; i < c_p_c; ++i) {
- unsigned temp2;
+ unsigned temp2 = temp / vr->classifications;
- temp2 = (((uint64_t)temp) * inverse_class) >> 32;
if (partition_count + c_p_c - 1 - i < ptns_to_read)
classifs[j_times_ptns_to_read + partition_count + c_p_c - 1 - i] = temp - temp2 * vr->classifications;
temp = temp2;
--
1.8.2.1
</pre>
Luca Barbato
2013-05-18T13:40:54
-
[PATCH 2/2] prores: update FATE test to account for alpha plane present in the test sample
http://comments.gmane.org/gmane.comp.video.libav.devel/46202
<pre>---
tests/fate/prores.mak | 2 +-
tests/ref/fate/prores-alpha | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/fate/prores.mak b/tests/fate/prores.mak
index 9c1a1b1..ccc71af 100644
--- a/tests/fate/prores.mak
+++ b/tests/fate/prores.mak
< at >< at > -11,4 +11,4 < at >< at > fate-prores-422: CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProR
fate-prores-422_hq: CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.mov -pix_fmt yuv422p10le
fate-prores-422_lt: CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov -pix_fmt yuv422p10le
fate-prores-422_proxy: CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -pix_fmt yuv422p10le
-fate-prores-alpha: CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuv444p10le
+fate-prores-alpha: CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuva444p10le
diff --git a/tests/ref/fate/prores-alpha b/tests/ref/fate/prores-alpha
index 80442fe..97be6cf 100644
--- a/tests/ref/fate/prores-alpha
+++ b/tests/ref/fate/prores-alpha
< at >< at > -1,3 +1,3 < at >< at >
#tb 0: 1/2997
-0, 0, 0, 0, 12441600, 0x254d8f95
-0, 100, 100, 0, 12441600, 0x254d8f95
+0, 0, 0, 0, 16588800, 0x8dcdb600
+0, 100, 100, 0, 16588800, 0x8dcdb600
</pre>
Kostya Shishkov
2013-05-18T05:16:30
-
[PATCH 1/2] proresdec: simplify slice componentoffsets handling
http://comments.gmane.org/gmane.comp.video.libav.devel/46201
<pre>---
I promised that after all...
---
libavcodec/proresdec.c | 50 ++++++++++++++++++++++++------------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c
index 0d1eb7a..8da2db6 100644
--- a/libavcodec/proresdec.c
+++ b/libavcodec/proresdec.c
< at >< at > -559,6 +559,7 < at >< at > static int decode_slice(AVCodecContext *avctx, void *tdata)
int slice_data_size, hdr_size;
int y_data_size, u_data_size, v_data_size, a_data_size;
int y_linesize, u_linesize, v_linesize, a_linesize;
+ int coff[4];
buf = ctx->slice_data[slice_num].index;
slice_data_size = ctx->slice_data[slice_num + 1].index - buf;
< at >< at > -586,6 +587,10 < at >< at > static int decode_slice(AVCodecContext *avctx, void *tdata)
v_linesize <<= 1;
a_linesize <<= 1;
}
+ y_data += (mb_y_pos << 4) * y_linesize + (mb_x_pos << 5);
+ u_data += (mb_y_pos << 4) * u_linesize + (mb_x_pos << ctx->mb_chroma_factor);
+ v_data += (mb_y_pos << 4) * v_linesize + (mb_x_pos << ctx->mb_chroma_factor);
+ a_data += (mb_y_pos << 4) * a_linesize + (mb_x_pos << 5);
if (slice_data_size < 6) {
av_log(avctx, AV_LOG_ERROR, "slice data too small\n");
< at >< at > -594,15 +599,18 < at >< at > static int decode_slice(AVCodecContext *avctx, void *tdata)
/* parse slice header */
hdr_size = buf[0] >> 3;
+ coff[0] = hdr_size;
y_data_size = AV_RB16(buf + 2);
+ coff[1] = coff[0] + y_data_size;
u_data_size = AV_RB16(buf + 4);
- v_data_size = hdr_size > 7 ? AV_RB16(buf + 6) :
- slice_data_size - y_data_size - u_data_size - hdr_size;
- a_data_size = slice_data_size - y_data_size - u_data_size -
- v_data_size - hdr_size;
-
- if (hdr_size + y_data_size + u_data_size + v_data_size > slice_data_size ||
- v_data_size < 0 || hdr_size < 6) {
+ coff[2] = coff[1] + u_data_size;
+ v_data_size = hdr_size > 7 ? AV_RB16(buf + 6) : slice_data_size - coff[2];
+ coff[3] = coff[2] + v_data_size;
+ a_data_size = slice_data_size - coff[3];
+
+ /* if V or alpha component size is negative that means that previous
+ component sizes are too large */
+ if (v_data_size < 0 || a_data_size < 0 || hdr_size < 6) {
av_log(avctx, AV_LOG_ERROR, "invalid data size\n");
return AVERROR_INVALIDDATA;
}
< at >< at > -621,37 +629,29 < at >< at > static int decode_slice(AVCodecContext *avctx, void *tdata)
}
/* decode luma plane */
- decode_slice_plane(ctx, td, buf + hdr_size, y_data_size,
- (uint16_t*) (y_data + (mb_y_pos << 4) * y_linesize +
- (mb_x_pos << 5)), y_linesize,
+ decode_slice_plane(ctx, td, buf + coff[0], y_data_size,
+ (uint16_t*) y_data, y_linesize,
mbs_per_slice, 4, slice_width_factor + 2,
td->qmat_luma_scaled, 0);
/* decode U chroma plane */
- decode_slice_plane(ctx, td, buf + hdr_size + y_data_size, u_data_size,
- (uint16_t*) (u_data + (mb_y_pos << 4) * u_linesize +
- (mb_x_pos << ctx->mb_chroma_factor)),
- u_linesize, mbs_per_slice, ctx->num_chroma_blocks,
+ decode_slice_plane(ctx, td, buf + coff[1], u_data_size,
+ (uint16_t*) u_data, u_linesize,
+ mbs_per_slice, ctx->num_chroma_blocks,
slice_width_factor + ctx->chroma_factor - 1,
td->qmat_chroma_scaled, 1);
/* decode V chroma plane */
- decode_slice_plane(ctx, td, buf + hdr_size + y_data_size + u_data_size,
- v_data_size,
- (uint16_t*) (v_data + (mb_y_pos << 4) * v_linesize +
- (mb_x_pos << ctx->mb_chroma_factor)),
- v_linesize, mbs_per_slice, ctx->num_chroma_blocks,
+ decode_slice_plane(ctx, td, buf + coff[2], v_data_size,
+ (uint16_t*) v_data, v_linesize,
+ mbs_per_slice, ctx->num_chroma_blocks,
slice_width_factor + ctx->chroma_factor - 1,
td->qmat_chroma_scaled, 1);
/* decode alpha plane if available */
if (a_data && a_data_size)
- decode_alpha_plane(ctx, td,
- buf + hdr_size + y_data_size +
- u_data_size + v_data_size,
- a_data_size,
- (uint16_t*) (a_data + (mb_y_pos << 4) * a_linesize +
- (mb_x_pos << 5)), a_linesize,
+ decode_alpha_plane(ctx, td, buf + coff[3], a_data_size,
+ (uint16_t*) a_data, a_linesize,
mbs_per_slice);
return 0;
</pre>
Kostya Shishkov
2013-05-18T05:16:04
-
[PATCH 1/3] wavpack: return meaningful errors
http://comments.gmane.org/gmane.comp.video.libav.devel/46194
<pre>And forward those that were already meaningful.
---
libavcodec/wavpack.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index c74901d..999e532 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
< at >< at > -777,14 +777,14 < at >< at > static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
if (block_no >= wc->fdec_num && wv_alloc_frame_context(wc) < 0) {
av_log(avctx, AV_LOG_ERROR, "Error creating frame decode context\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
s = wc->fdec[block_no];
if (!s) {
av_log(avctx, AV_LOG_ERROR, "Context for block %d is not present\n",
block_no);
- return -1;
+ return AVERROR_INVALIDDATA;
}
memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr));
< at >< at > -1034,7 +1034,7 < at >< at > static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
if (size <= 1) {
av_log(avctx, AV_LOG_ERROR,
"Insufficient channel information\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
chan = *buf++;
switch (size - 2) {
< at >< at > -1057,7 +1057,7 < at >< at > static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
"Block reports total %d channels, "
"decoder believes it's %d channels\n",
chan, avctx->channels);
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (!avctx->channel_layout)
avctx->channel_layout = chmask;
< at >< at > -1072,31 +1072,31 < at >< at > static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
if (!got_terms) {
av_log(avctx, AV_LOG_ERROR, "No block with decorrelation terms\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (!got_weights) {
av_log(avctx, AV_LOG_ERROR, "No block with decorrelation weights\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (!got_samples) {
av_log(avctx, AV_LOG_ERROR, "No block with decorrelation samples\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (!got_entropy) {
av_log(avctx, AV_LOG_ERROR, "No block with entropy info\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (s->hybrid && !got_hybrid) {
av_log(avctx, AV_LOG_ERROR, "Hybrid config not found\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (!got_bs) {
av_log(avctx, AV_LOG_ERROR, "Packed samples not found\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (!got_float && avctx->sample_fmt == AV_SAMPLE_FMT_FLT) {
av_log(avctx, AV_LOG_ERROR, "Float information not found\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (s->got_extra_bits && avctx->sample_fmt != AV_SAMPLE_FMT_FLT) {
const int size = get_bits_left(&s->gb_extra_bits);
< at >< at > -1116,7 +1116,7 < at >< at > static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
samplecount = wv_unpack_stereo(s, &s->gb, samples, AV_SAMPLE_FMT_FLT);
if (samplecount < 0)
- return -1;
+ return samplecount;
samplecount >>= 1;
} else {
< at >< at > -1130,7 +1130,7 < at >< at > static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
samplecount = wv_unpack_mono(s, &s->gb, samples, AV_SAMPLE_FMT_FLT);
if (samplecount < 0)
- return -1;
+ return samplecount;
if (s->stereo && avctx->sample_fmt == AV_SAMPLE_FMT_S16) {
int16_t *dst = (int16_t*)samples + 1;
< at >< at > -1205,7 +1205,7 < at >< at > static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
if (s->samples <= 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid number of samples: %d\n",
s->samples);
- return AVERROR(EINVAL);
+ return AVERROR_INVALIDDATA;
}
if (frame_flags & 0x80) {
< at >< at > -1241,13 +1241,13 < at >< at > static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
"Block %d has invalid size (size %d vs. %d bytes left)\n",
s->block, frame_size, buf_size);
wavpack_decode_flush(avctx);
- return -1;
+ return AVERROR_INVALIDDATA;
}
if ((samplecount = wavpack_decode_block(avctx, s->block,
frame->data[0], got_frame_ptr,
buf, frame_size)) < 0) {
wavpack_decode_flush(avctx);
- return -1;
+ return samplecount;
}
s->block++;
buf += frame_size; buf_size -= frame_size;
--
1.8.2.1
</pre>
Luca Barbato
2013-05-17T21:15:35
-
[PATCH] prores: decode alpha plane when it's present
http://comments.gmane.org/gmane.comp.video.libav.devel/46177
<pre>---
Maybe I'll work on encoder support as well.
---
libavcodec/proresdec.c | 112 ++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 103 insertions(+), 9 deletions(-)
diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c
index c42e444..0d1eb7a 100644
--- a/libavcodec/proresdec.c
+++ b/libavcodec/proresdec.c
< at >< at > -134,12 +134,21 < at >< at > static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
ctx->chroma_factor = (buf[12] >> 6) & 3;
ctx->mb_chroma_factor = ctx->chroma_factor + 2;
ctx->num_chroma_blocks = (1 << ctx->chroma_factor) >> 1;
+ ctx->alpha_info = buf[17] & 0xf;
+
+ if (ctx->alpha_info > 2) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid alpha mode %d\n", ctx->alpha_info);
+ return AVERROR_INVALIDDATA;
+ }
+
switch (ctx->chroma_factor) {
case 2:
- avctx->pix_fmt = AV_PIX_FMT_YUV422P10;
+ avctx->pix_fmt = ctx->alpha_info ? AV_PIX_FMT_YUVA422P10
+ : AV_PIX_FMT_YUV422P10;
break;
case 3:
- avctx->pix_fmt = AV_PIX_FMT_YUV444P10;
+ avctx->pix_fmt = ctx->alpha_info ? AV_PIX_FMT_YUVA444P10
+ : AV_PIX_FMT_YUV444P10;
break;
default:
av_log(avctx, AV_LOG_ERROR,
< at >< at > -168,10 +177,6 < at >< at > static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
avctx->color_trc = buf[15];
avctx->colorspace = buf[16];
- ctx->alpha_info = buf[17] & 0xf;
- if (ctx->alpha_info)
- avpriv_report_missing_feature(avctx, "Alpha channel");
-
ctx->qmat_changed = 0;
ptr = buf + 20;
flags = buf[19];
< at >< at > -466,6 +471,78 < at >< at > static void decode_slice_plane(ProresContext *ctx, ProresThreadData *td,
}
+static void unpack_alpha(GetBitContext *gb, uint16_t *dst, int num_coeffs,
+ const int num_bits)
+{
+ const int mask = (1 << num_bits) - 1;
+ int i, idx, val, alpha_val;
+
+ idx = 0;
+ alpha_val = mask;
+ do {
+ do {
+ if (get_bits1(gb))
+ val = get_bits(gb, num_bits);
+ else {
+ int sign;
+ val = get_bits(gb, num_bits == 16 ? 7 : 4);
+ sign = val & 1;
+ val = (val + 2) >> 1;
+ if (sign)
+ val = -val;
+ }
+ alpha_val = (alpha_val + val) & mask;
+ if (num_bits == 16)
+ dst[idx++] = alpha_val >> 6;
+ else
+ dst[idx++] = (alpha_val << 2) | (alpha_val >> 6);
+ if (idx == num_coeffs - 1)
+ break;
+ } while (get_bits1(gb));
+ val = get_bits(gb, 4);
+ if (!val)
+ val = get_bits(gb, 11);
+ if (idx + val > num_coeffs)
+ val = num_coeffs - idx;
+ if (num_bits == 16)
+ for (i = 0; i < val; i++)
+ dst[idx++] = alpha_val >> 6;
+ else
+ for (i = 0; i < val; i++)
+ dst[idx++] = (alpha_val << 2) | (alpha_val >> 6);
+ } while (idx < num_coeffs);
+}
+
+/**
+ * Decode alpha slice plane.
+ */
+static void decode_alpha_plane(ProresContext *ctx, ProresThreadData *td,
+ const uint8_t *buf, int data_size,
+ uint16_t *out_ptr, int linesize,
+ int mbs_per_slice)
+{
+ GetBitContext gb;
+ int i;
+ uint16_t *block_ptr;
+
+ memset(td->blocks, 0, 8 * 4 * 64 * sizeof(*td->blocks));
+
+ init_get_bits(&gb, buf, data_size << 3);
+
+ if (ctx->alpha_info == 2)
+ unpack_alpha(&gb, td->blocks, mbs_per_slice * 4 * 64, 16);
+ else
+ unpack_alpha(&gb, td->blocks, mbs_per_slice * 4 * 64, 8);
+
+ block_ptr = td->blocks;
+
+ for (i = 0; i < 16; i++) {
+ memcpy(out_ptr, block_ptr, 16 * mbs_per_slice * sizeof(*out_ptr));
+ out_ptr += linesize >> 1;
+ block_ptr += 16 * mbs_per_slice;
+ }
+}
+
static int decode_slice(AVCodecContext *avctx, void *tdata)
{
ProresThreadData *td = tdata;
< at >< at > -476,11 +553,12 < at >< at > static int decode_slice(AVCodecContext *avctx, void *tdata)
int slice_num = td->slice_num;
int mbs_per_slice = td->slice_width;
const uint8_t *buf;
- uint8_t *y_data, *u_data, *v_data;
+ uint8_t *y_data, *u_data, *v_data, *a_data;
AVFrame *pic = ctx->frame;
int i, sf, slice_width_factor;
- int slice_data_size, hdr_size, y_data_size, u_data_size, v_data_size;
- int y_linesize, u_linesize, v_linesize;
+ int slice_data_size, hdr_size;
+ int y_data_size, u_data_size, v_data_size, a_data_size;
+ int y_linesize, u_linesize, v_linesize, a_linesize;
buf = ctx->slice_data[slice_num].index;
slice_data_size = ctx->slice_data[slice_num + 1].index - buf;
< at >< at > -490,19 +568,23 < at >< at > static int decode_slice(AVCodecContext *avctx, void *tdata)
y_data = pic->data[0];
u_data = pic->data[1];
v_data = pic->data[2];
+ a_data = pic->data[3];
y_linesize = pic->linesize[0];
u_linesize = pic->linesize[1];
v_linesize = pic->linesize[2];
+ a_linesize = pic->linesize[3];
if (pic->interlaced_frame) {
if (!(pic_num ^ pic->top_field_first)) {
y_data += y_linesize;
u_data += u_linesize;
v_data += v_linesize;
+ a_data += a_linesize;
}
y_linesize <<= 1;
u_linesize <<= 1;
v_linesize <<= 1;
+ a_linesize <<= 1;
}
if (slice_data_size < 6) {
< at >< at > -516,6 +598,8 < at >< at > static int decode_slice(AVCodecContext *avctx, void *tdata)
u_data_size = AV_RB16(buf + 4);
v_data_size = hdr_size > 7 ? AV_RB16(buf + 6) :
slice_data_size - y_data_size - u_data_size - hdr_size;
+ a_data_size = slice_data_size - y_data_size - u_data_size -
+ v_data_size - hdr_size;
if (hdr_size + y_data_size + u_data_size + v_data_size > slice_data_size ||
v_data_size < 0 || hdr_size < 6) {
< at >< at > -560,6 +644,16 < at >< at > static int decode_slice(AVCodecContext *avctx, void *tdata)
slice_width_factor + ctx->chroma_factor - 1,
td->qmat_chroma_scaled, 1);
+ /* decode alpha plane if available */
+ if (a_data && a_data_size)
+ decode_alpha_plane(ctx, td,
+ buf + hdr_size + y_data_size +
+ u_data_size + v_data_size,
+ a_data_size,
+ (uint16_t*) (a_data + (mb_y_pos << 4) * a_linesize +
+ (mb_x_pos << 5)), a_linesize,
+ mbs_per_slice);
+
return 0;
}
</pre>
Kostya Shishkov
2013-05-17T17:43:36
-
[PATCH 1/3] mjpeg: Validate sampling factors
http://comments.gmane.org/gmane.comp.video.libav.devel/46167
<pre>They must be non-zero.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable-LOOeJiBropLYtjvyW6yDsg< at >public.gmane.org
---
libavcodec/mjpegdec.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index ef46c5f..83b40d9 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
< at >< at > -265,6 +265,13 < at >< at > int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
s->quant_index[i] = get_bits(&s->gb, 8);
if (s->quant_index[i] >= 4)
return AVERROR_INVALIDDATA;
+ if (!s->h_count[i] || !s->v_count[i]) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Invalid sampling factor in component %d %d:%d\n",
+ i, s->h_count[i], s->v_count[i]);
+ return AVERROR_INVALIDDATA;
+ }
+
av_log(s->avctx, AV_LOG_DEBUG, "component %d %d:%d id: %d quant:%d\n",
i, s->h_count[i], s->v_count[i],
s->component_id[i], s->quant_index[i]);
</pre>
Luca Barbato
2013-05-17T15:35:33
-
[PATCH] configure: msvc: Set the target windowsversion to XP if no target is set
http://comments.gmane.org/gmane.comp.video.libav.devel/46160
<pre>MSVC 2010 (or more precisely, Windows SDK 7.0 which comes with MSVC
2010) sets _WIN32_WINNT to the constant for Windows 7 if nothing is
set. This could lead to the libav configure script detecting and
using functions only present in Windows 7 or newer, which in most
cases isn't desired. If the caller explicitly wants this, the caller
can add the _WIN32_WINNT define via --extra-cflags, setting the desired
version.
---
configure | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure b/configure
index 94804bd..79b0a92 100755
--- a/configure
+++ b/configure
< at >< at > -3197,6 +3197,7 < at >< at > elif check_func_headers stdlib.h _get_doserrno; then
add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \
_snprintf=avpriv_snprintf \
vsnprintf=avpriv_vsnprintf
+ check_cpp_condition stdlib.h "defined(_WIN32_WINNT)" || add_cppflags -D_WIN32_WINNT=0x0502
elif check_cpp_condition stddef.h "defined __KLIBC__"; then
libc_type=klibc
fi
</pre>
Martin Storsjö
2013-05-17T14:20:52
-
[PATCH] jpegls: check the scan offset
http://comments.gmane.org/gmane.comp.video.libav.devel/46159
<pre>Prevent an out of array bound write.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable-LOOeJiBropLYtjvyW6yDsg< at >public.gmane.org
---
libavcodec/jpeglsdec.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index 3616063..df72ca3 100644
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
< at >< at > -306,6 +306,10 < at >< at > int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
av_dlog(s->avctx, "JPEG params: ILV=%i Pt=%i BPP=%i, scan = %i\n",
ilv, point_transform, s->bits, s->cur_scan);
if (ilv == 0) { /* separate planes */
+ if (s->cur_scan > s->nb_components) {
+ ret = AVERROR_INVALIDDATA;
+ goto end;
+ }
off = s->cur_scan - 1;
stride = (s->nb_components > 1) ? 3 : 1;
width = s->width * stride;
</pre>
Luca Barbato
2013-05-17T14:20:34
-
[PATCH] build: do not leave asserts enabled
http://comments.gmane.org/gmane.comp.video.libav.devel/46157
<pre>A library should not crash on purpose.
---
I find dangerous leaving them around, the performance loss is negligible
probably, but leaving them around on release build feels wrong nonetheless.
libavcodec/dvdsubenc.c | 2 +-
libavcodec/libschroedingerdec.c | 2 +-
libavcodec/libschroedingerenc.c | 2 +-
libavcodec/libvorbis.c | 2 +-
libavcodec/libxvid_rc.c | 2 +-
libavcodec/motion_est.c | 2 +-
libavcodec/mpegvideo_xvmc.c | 2 +-
libavcodec/qcelpdec.c | 2 +-
libavcodec/qdm2.c | 2 +-
libavcodec/ratecontrol.c | 2 +-
libavcodec/svq1dec.c | 2 +-
libavcodec/svq1enc.c | 2 +-
libavcodec/vc1.c | 2 +-
libavcodec/vc1dec.c | 2 +-
libavcodec/vdpau.c | 2 +-
libavcodec/vorbisdec.c | 2 +-
libavcodec/vorbisenc.c | 2 +-
libavcodec/wma.c | 2 +-
libavcodec/wmadec.c | 2 +-
libavcodec/wmaenc.c | 2 +-
libavfilter/vf_yadif.c | 2 +-
libavformat/asfdec.c | 2 +-
libavformat/asfenc.c | 2 +-
libavformat/avidec.c | 2 +-
libavformat/flvenc.c | 2 +-
libavformat/mov.c | 2 +-
libavformat/movenc.c | 2 +-
libavformat/mpeg.c | 2 +-
libavformat/mpegenc.c | 2 +-
libavformat/mux.c | 2 +-
libavformat/nutdec.c | 2 +-
libavformat/swf.h | 2 +-
libavformat/utils.c | 2 +-
33 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c
index 5e362b7..c8fb521 100644
--- a/libavcodec/dvdsubenc.c
+++ b/libavcodec/dvdsubenc.c
< at >< at > -21,7 +21,7 < at >< at >
#include "avcodec.h"
#include "bytestream.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
// ncnt is the nibble counter
diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c
index 7fedc63..ee9abf7 100644
--- a/libavcodec/libschroedingerdec.c
+++ b/libavcodec/libschroedingerdec.c
< at >< at > -37,7 +37,7 < at >< at >
#include "internal.h"
#include "libschroedinger.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c
index 210dd34..fe6f7b4 100644
--- a/libavcodec/libschroedingerenc.c
+++ b/libavcodec/libschroedingerenc.c
< at >< at > -27,7 +27,7 < at >< at >
* (http://dirac.sourceforge.net/specification.html).
*/
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
#include <schroedinger/schro.h>
diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c
index 8e02057..aa40d40 100644
--- a/libavcodec/libvorbis.c
+++ b/libavcodec/libvorbis.c
< at >< at > -35,7 +35,7 < at >< at >
#include "vorbis.h"
#include "vorbis_parser.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
/* Number of samples the user should send in each call.
diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c
index 9084d33..dc9ca32 100644
--- a/libavcodec/libxvid_rc.c
+++ b/libavcodec/libxvid_rc.c
< at >< at > -32,7 +32,7 < at >< at >
#include "libxvid.h"
#include "mpegvideo.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
/* Wrapper to work around the lack of mkstemp() on mingw.
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 04ae49e..b5a60f0 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
< at >< at > -35,7 +35,7 < at >< at >
#include "mathops.h"
#include "mpegvideo.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
#define P_LEFT P[1]
diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c
index e95c91f..15ae072 100644
--- a/libavcodec/mpegvideo_xvmc.c
+++ b/libavcodec/mpegvideo_xvmc.c
< at >< at > -25,7 +25,7 < at >< at >
#include "avcodec.h"
#include "mpegvideo.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
#include "xvmc.h"
diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c
index ead7d90..f81f13b 100644
--- a/libavcodec/qcelpdec.c
+++ b/libavcodec/qcelpdec.c
< at >< at > -40,7 +40,7 < at >< at >
#include "acelp_vectors.h"
#include "lsp.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
typedef enum {
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 1e0811c..f3ccfaa 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
< at >< at > -47,7 +47,7 < at >< at >
#include "qdm2data.h"
#include "qdm2_tablegen.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 5aaf151..f2d96de 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
< at >< at > -31,7 +31,7 < at >< at >
#include "mpegvideo.h"
#include "libavutil/eval.h"
-#undef NDEBUG // Always check asserts, the speed effect is far too small to disable them.
+//#undef NDEBUG // Always check asserts, the speed effect is far too small to disable them.
#include <assert.h>
#ifndef M_E
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index 4b8b656..b826a5d 100644
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c
< at >< at > -39,7 +39,7 < at >< at >
#include "mathops.h"
#include "svq1.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
extern const uint8_t ff_mvtab[33][2];
diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c
index 70d1ee5..fe15b2d 100644
--- a/libavcodec/svq1enc.c
+++ b/libavcodec/svq1enc.c
< at >< at > -35,7 +35,7 < at >< at >
#include "svq1.h"
#include "svq1enc_cb.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
typedef struct SVQ1Context {
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 23012cd..c0f014c 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
< at >< at > -37,7 +37,7 < at >< at >
#include "unary.h"
#include "simple_idct.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
/***********************************************************************/
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index a1c9890..83c54c1 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
< at >< at > -40,7 +40,7 < at >< at >
#include "mathops.h"
#include "vdpau_internal.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
#define MB_INTRA_VLC_BITS 9
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index bf1f81e..821baa9 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
< at >< at > -26,7 +26,7 < at >< at >
#include "h264.h"
#include "vc1.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
#include "vdpau.h"
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index 03c80b4..b55c498 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
< at >< at > -42,7 +42,7 < at >< at >
#define V_MAX_VLCS (1 << 16)
#define V_MAX_PARTITIONS (1 << 20)
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
typedef struct {
diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c
index db0394a..5658b64 100644
--- a/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
< at >< at > -34,7 +34,7 < at >< at >
#define BITSTREAM_WRITER_LE
#include "put_bits.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
typedef struct {
diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index db27646..5a06d9f 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
< at >< at > -26,7 +26,7 < at >< at >
#include "wma_common.h"
#include "wmadata.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
/* XXX: use same run/length optimization as mpeg decoders */
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index b9b176e..30667cb 100644
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
< at >< at > -38,7 +38,7 < at >< at >
#include "internal.h"
#include "wma.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
#define EXPVLCBITS 8
diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c
index f5bdb67..279a3e6 100644
--- a/libavcodec/wmaenc.c
+++ b/libavcodec/wmaenc.c
< at >< at > -24,7 +24,7 < at >< at >
#include "internal.h"
#include "wma.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index 2b89048..837b655 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
< at >< at > -29,7 +29,7 < at >< at >
#include "video.h"
#include "yadif.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
#define CHECK(j)\
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index a7fdc9e..c445944 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
< at >< at > -91,7 +91,7 < at >< at > static const AVClass asf_class = {
.version = LIBAVUTIL_VERSION_INT,
};
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
#define ASF_MAX_STREAMS 127
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c
index a523b3a..c8e048b 100644
--- a/libavformat/asfenc.c
+++ b/libavformat/asfenc.c
< at >< at > -26,7 +26,7 < at >< at >
#include "riff.h"
#include "asf.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index cf24e8c..9deb475 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
< at >< at > -30,7 +30,7 < at >< at >
#include "dv.h"
#include "riff.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
typedef struct AVIStream {
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 37f3777..379f9ce 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
< at >< at > -27,7 +27,7 < at >< at >
#include "internal.h"
#include "metadata.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
static const AVCodecTag flv_video_codec_ids[] = {
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2d87a08..1257d03 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
< at >< at > -51,7 +51,7 < at >< at >
#include "qtpalette.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
/* those functions parse an atom */
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 4ed99b7..8e9ecf8 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
< at >< at > -40,7 +40,7 < at >< at >
#include "rtpenc.h"
#include "mov_chan.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
static const AVOption options[] = {
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 8a4c6d7..d57e423 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
< at >< at > -23,7 +23,7 < at >< at >
#include "internal.h"
#include "mpeg.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
/*********************************************/
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 85a12d6..ccbe76b 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
< at >< at > -31,7 +31,7 < at >< at >
#define MAX_PAYLOAD_SIZE 4096
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
typedef struct PacketDesc {
diff --git a/libavformat/mux.c b/libavformat/mux.c
index b51f906..14d74db 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
< at >< at > -42,7 +42,7 < at >< at >
#include "network.h"
#endif
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
/**
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index cc5869e..ad9970b 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
< at >< at > -29,7 +29,7 < at >< at >
#include "nut.h"
#include "riff.h"
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
#define NUT_MAX_STREAMS 256 /* arbitrary sanity check value */
diff --git a/libavformat/swf.h b/libavformat/swf.h
index 79c3c1d..419ca87 100644
--- a/libavformat/swf.h
+++ b/libavformat/swf.h
< at >< at > -61,7 +61,7 < at >< at >
#define VIDEO_ID 0
#define SHAPE_ID 1
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
typedef struct SWFContext {
diff --git a/libavformat/utils.c b/libavformat/utils.c
index eb01886..34e42a7 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
< at >< at > -42,7 +42,7 < at >< at >
#include "network.h"
#endif
-#undef NDEBUG
+//#undef NDEBUG
#include <assert.h>
/**
--
1.8.2.1
</pre>
Luca Barbato
2013-05-17T13:26:58
-
jpegls fixes
http://comments.gmane.org/gmane.comp.video.libav.devel/46144
<pre>Here the full set with Kostya comments hopefully addressed.
</pre>
Luca Barbato
2013-05-17T11:26:56
-
[PATCH] jpegls: factorize return paths
http://comments.gmane.org/gmane.comp.video.libav.devel/46139
<pre>---
Needed by following patches adding more failure paths.
libavcodec/jpeglsdec.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index ca85def..707295b 100644
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
< at >< at > -274,7 +274,7 < at >< at > int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
int i, t = 0;
uint8_t *zero, *last, *cur;
JLSState *state;
- int off = 0, stride = 1, width, shift;
+ int off = 0, stride = 1, width, shift, ret = 0;
zero = av_mallocz(s->picture_ptr->linesize[0]);
last = zero;
< at >< at > -348,9 +348,8 < at >< at > int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
} else if (ilv == 2) { /* sample interleaving */
av_log(s->avctx, AV_LOG_ERROR,
"Sample interleaved images are not supported.\n");
- av_free(state);
- av_free(zero);
- return AVERROR(ENOSYS);
+ ret = AVERROR(ENOSYS);
+ goto out;
}
if (shift) { /* we need to do point transform or normalize samples */
< at >< at > -376,10 +375,12 < at >< at > int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
}
}
}
+
+out:
av_free(state);
av_free(zero);
- return 0;
+ return ret;
}
AVCodec ff_jpegls_decoder = {
--
1.8.2.1
</pre>
Luca Barbato
2013-05-17T10:39:46
-
[PATCH 1/2] jpegls: do not use magic numbers
http://comments.gmane.org/gmane.comp.video.libav.devel/46135
<pre>3 is not exactly descriptive.
---
libavcodec/jpegls.h | 4 +++-
libavcodec/jpeglsdec.c | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h
index 4bf9562..1ab15ee 100644
--- a/libavcodec/jpegls.h
+++ b/libavcodec/jpegls.h
< at >< at > -36,12 +36,14 < at >< at > typedef struct JpeglsContext {
AVFrame picture;
} JpeglsContext;
+#define COMPONENTS 3
+
typedef struct JLSState {
int T1, T2, T3;
int A[367], B[367], C[365], N[367];
int limit, reset, bpp, qbpp, maxval, range;
int near, twonear;
- int run_index[3];
+ int run_index[COMPONENTS];
} JLSState;
extern const uint8_t ff_log2_run[32];
diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index 6d884a4..d4ecf3d 100644
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
< at >< at > -332,7 +332,7 < at >< at > int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
memset(cur, 0, s->picture_ptr->linesize[0]);
width = s->width * 3;
for (i = 0; i < s->height; i++) {
- for (j = 0; j < 3; j++) {
+ for (j = 0; j < COMPONENTS; j++) {
ls_decode_line(state, s, last + j, cur + j,
Rc[j], width, 3, j, 8);
Rc[j] = last[j];
</pre>
Luca Barbato
2013-05-17T10:36:29
Search Engine
Search the mailing list at Gmane
query
http://search.gmane.org/?group=$group=gmane.comp.video.libav.devel