[FFmpeg-cvslog] build: use pkg-config to detect libmodplug
ffmpeg | branch: master | Clément Bœsch | Mon Sep 1
08:58:50 2014 +0200| [36952786a5cca8784f582a071c0d73ab1e3252a1] | committer:
Clément Bœsch
build: use pkg-config to detect libmodplug
Fix static build, at least for OSX.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36952786a5cca8784f582a071c0d73ab1e3252a1
---
configure |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 8e5f49b..80f2748 100755
--- a/configure
+++ b/configure
@@ -4806,7 +4806,7 @@ enabled libgsm&& { for gsm_hdr in "gsm.h"
"gsm/gsm.h"; do
check_lib "${gsm_hdr}" gsm_create -lgsm &&
break;
done || die "ERROR: libgsm not found"; }
enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode
-lilbc
-enabled libmodplug&& require libmodplug libmodplug/modplug.h
ModPlug_Load -lmodplug
+enabled libmodplug&& require_pkg_config libmodplug
libmodplug/modplug.h ModPlug_Load
enabled libmp3lame&& require "libmp3lame >= 3.98.3" lame/lame.h
lame_set_VBR_quality -lmp3lame
enabled libnut&& require libnut libnut.h nut_demuxer_init -lnut
enabled libopencore_amrnb && require libopencore_amrnb
opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavu/avstring: check for overlong encodings in av_utf8_decode()
ffmpeg | branch: master | Stefano Sabatini | Thu Aug 28
17:37:27 2014 +0200| [d4ec07dfe7dbc86e8f6403781c511b9463a526d2] | committer:
Stefano Sabatini
lavu/avstring: check for overlong encodings in av_utf8_decode()
Fix reopened trac ticket #1163.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d4ec07dfe7dbc86e8f6403781c511b9463a526d2
---
libavutil/avstring.c | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index a63fb84..fd010e4 100644
--- a/libavutil/avstring.c
+++ b/libavutil/avstring.c
@@ -27,6 +27,7 @@
#include "config.h"
#include "common.h"
#include "mem.h"
+#include "avassert.h"
#include "avstring.h"
#include "bprint.h"
@@ -331,7 +332,10 @@ int av_utf8_decode(int32_t *codep, const uint8_t **bufp,
const uint8_t *buf_end,
const uint8_t *p = *bufp;
uint32_t top;
uint64_t code;
-int ret = 0;
+int ret = 0, tail_len;
+uint32_t overlong_encoding_mins[6] = {
+0x, 0x0080, 0x0800, 0x0001, 0x0020, 0x0400,
+};
if (p >= buf_end)
return 0;
@@ -346,8 +350,10 @@ int av_utf8_decode(int32_t *codep, const uint8_t **bufp,
const uint8_t *buf_end,
}
top = (code & 128) >> 1;
+tail_len = 0;
while (code & top) {
int tmp;
+tail_len++;
if (p >= buf_end) {
(*bufp) ++;
return AVERROR(EILSEQ); /* incomplete sequence */
@@ -364,6 +370,13 @@ int av_utf8_decode(int32_t *codep, const uint8_t **bufp,
const uint8_t *buf_end,
}
code &= (top << 1) - 1;
+/* check for overlong encodings */
+av_assert0(tail_len <= 5);
+if (code < overlong_encoding_mins[tail_len]) {
+ret = AVERROR(EILSEQ);
+goto end;
+}
+
if (code >= 1<<31) {
ret = AVERROR(EILSEQ); /* out-of-range value */
goto end;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] RELEASE_NOTES: mention libmodplug detection change
ffmpeg | branch: master | Clément Bœsch | Mon Sep 1 11:36:02 2014 +0200| [343f07e15c58d73a5f8567a5fe27beceb9155de7] | committer: Clément Bœsch RELEASE_NOTES: mention libmodplug detection change > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=343f07e15c58d73a5f8567a5fe27beceb9155de7 --- RELEASE_NOTES |1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 3fbf556..87a0053 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -51,3 +51,4 @@ • dctdnoiz filter now uses a block size of 8x8 instead of 16x16 by default • -vismv option is deprecated in favor of the codecview filter + • libmodplug is now detected through pkg-config ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. beccedc web: Add generate-doc.sh to generate makeinfo-based ffmpeg docs
The branch, master has been updated
via beccedc88c4df38f233984e62c85283f9b48bb77 (commit)
via 88e2d5e52f85bc61a000e50270414dcda0e62f34 (commit)
via 68fe7a2ae2b630a24f8a444e57947a4324f7f5aa (commit)
from 237d4160182e6795d93591f107a21fb781b5f718 (commit)
- Log -
commit beccedc88c4df38f233984e62c85283f9b48bb77
Author: Timothy Gu
AuthorDate: Sun Aug 31 19:53:31 2014 -0700
Commit: Michael Niedermayer
CommitDate: Mon Sep 1 12:29:48 2014 +0200
web: Add generate-doc.sh to generate makeinfo-based ffmpeg docs
Signed-off-by: Timothy Gu
diff --git a/README b/README
index 2276820..ca70560 100644
--- a/README
+++ b/README
@@ -15,17 +15,7 @@ GENERATE THE DOCUMENTATION
/!\ None of the generated versions of the website contain the documentation.
-To generate the documentation pages:
-- Add the HTML wrappers to your environment:
- $ export FFMPEG_HEADER1="$(cat src/template_head1 src/template_doctitle
src/template_head_prod)"
- $ export FFMPEG_HEADER2="$(cat src/template_head2 src/template_doctitle
src/template_head3)"
- $ export FFMPEG_FOOTER="$(cat src/template_footer1 src/template_footer_prod
src/template_footer2)"
-- Get the main ffmpeg repo:
- $ git clone git://source.ffmpeg.org/ffmpeg.git
-- Compile the documentation using the ffmpeg main repo Makefile:
- $ make doc
-- Copy the generated HTML files inside the website:
- $ cp /path/to/ffmpeg/doc/*.html /path/to/ffmpeg-web/htdocs/
+To generate the documentation pages, just `./generate-doc.sh `.
In case of a major CSS update, please also update the `style.min.css` file in
the main FFmpeg repo:
diff --git a/generate-doc.sh b/generate-doc.sh
new file mode 100755
index 000..f953a9a
--- /dev/null
+++ b/generate-doc.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# Copyright (c) 2014 Tiancheng "Timothy" Gu.
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+die() {
+echo $1
+exit 1
+}
+
+if [ $# != 1 ]; then
+die "Usage: $0 "
+fi
+
+src=$1
+current_dir=$(pwd)
+
+export FFMPEG_HEADER1="$(cat src/template_head1)"
+export FFMPEG_HEADER2="$(cat src/template_head_prod src/template_head2)"
+export FFMPEG_HEADER3="$(cat src/template_head3)"
+export FFMPEG_FOOTER="$(cat src/template_footer1 src/template_footer_prod
src/template_footer2)"
+
+rm -rf build-doc
+mkdir build-doc && cd build-doc
+$src/configure --enable-gpl --disable-yasm || die "configure failed"
+make doc || die "doc not made"
+cp doc/*.html ../htdocs/ || die "copy failed"
+
+cd ..
+rm -rf build-doc
\ No newline at end of file
commit 88e2d5e52f85bc61a000e50270414dcda0e62f34
Author: Timothy Gu
AuthorDate: Sun Aug 31 19:53:30 2014 -0700
Commit: Michael Niedermayer
CommitDate: Mon Sep 1 12:12:17 2014 +0200
style: add "warning" style similar to .info but has a red border
Signed-off-by: Timothy Gu
diff --git a/src/less/style.less b/src/less/style.less
index 6a26684..0c9ea03 100644
--- a/src/less/style.less
+++ b/src/less/style.less
@@ -15,6 +15,7 @@
@Cseconddarkdark: darken(@Cseconddark, 10%);
@Csecondlight: lighten(@Csecond, 15%);
@Csecondlightlight: lighten(@Csecondlight, 20%);
+@Cwarning: #ae4c4c;
// * //
// SIZES
@@ -180,17 +181,24 @@ a.well {
}
}
-.info {
+.info, .warning {
margin: 10px;
padding: 10px;
background-color: @Cmainlight;
-border-left: 10px @Csecond solid;
color: @Cinvert;
code {
background-color: @Cmain;
}
}
+.info {
+border-left: 10px @Csecond solid;
+}
+
+.warning {
+border-left: 10px @Cwarning solid;
+}
+
.with-icon {
padding: 30px;
.pull-left {
commit 68fe7a2ae2b630a24f8a444e57947a4324f7f5aa
Author: Michael Niedermayer
AuthorDate: Sat Aug 30 23:36:15 2014 +0200
Commit: Michael Niedermayer
CommitDate: Sat Aug 30 23:37:06 2014 +0200
web/security: put 5865d599c38850b2a1fd33fe197eb8fcc6c970a4 under () as the
encoder lacked alpha support back then
diff --git a/src/security b/src/security
index da94f25..f521cca 100644
--- a/src/security
+++ b/src/security
@@ -276,7 +276,7 @@ Fixes following vulnerabilities:
CVE-2014-5272, 5865d599c38850b2a1fd33fe197eb8fcc6c970a4 /
3539d6c63a16e1b2874bb037a86f317449c5
[FFmpeg-cvslog] general: Fix usage of @float
ffmpeg | branch: master | Timothy Gu | Sun Aug 31
19:42:50 2014 -0700| [8d6ec6118698efaa662044a538e3dbc790d2f46b] | committer:
Michael Niedermayer
general: Fix usage of @float
makeinfo chokes on that.
Signed-off-by: Timothy Gu
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d6ec6118698efaa662044a538e3dbc790d2f46b
---
doc/general.texi |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/general.texi b/doc/general.texi
index 9ce0b31..8d7555d 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -130,7 +130,7 @@ Go to @url{http://x265.org/developers.html} and follow the
instructions
for installing the library. Then pass @code{--enable-libx265} to configure
to enable it.
-@float note
+@float NOTE
x265 is under the GNU Public License Version 2 or later
(see @url{http://www.gnu.org/licenses/old-licenses/gpl-2.0.html} for
details), you must upgrade FFmpeg's license to GPL in order to use it.
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] h261dec, ituh263dec: Move condition.
ffmpeg | branch: master | Reimar Döffinger | Sun Aug
31 23:01:09 2014 +0200| [e8d0b84e8a5893ed29993e743de82079c93b5fb6] | committer:
Reimar Döffinger
h261dec, ituh263dec: Move condition.
Stops compiler from doing incredibly stupid things.
With vsynth1-flv inner loop goes from 3501 to 3275
decicycles.
Signed-off-by: Reimar Döffinger
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e8d0b84e8a5893ed29993e743de82079c93b5fb6
---
libavcodec/h261dec.c| 12 ++--
libavcodec/ituh263dec.c | 10 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index 9b95775..a8aae6e 100644
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -309,13 +309,13 @@ static int h261_decode_block(H261Context *h, int16_t
*block, int n, int coded)
for (;;) {
UPDATE_CACHE(re, &s->gb);
GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TCOEFF_VLC_BITS, 2,
0);
-if (run == 66 && level) {
-CLOSE_READER(re, &s->gb);
-av_log(s->avctx, AV_LOG_ERROR, "illegal ac vlc code at %dx%d\n",
- s->mb_x, s->mb_y);
-return -1;
-}
if (run == 66) {
+if (level) {
+CLOSE_READER(re, &s->gb);
+av_log(s->avctx, AV_LOG_ERROR, "illegal ac vlc code at
%dx%d\n",
+ s->mb_x, s->mb_y);
+return -1;
+}
/* escape */
/* The remaining combinations of (run, level) are encoded with a
* 20-bit word consisting of 6 bits escape, 6 bits run and 8 bits
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index 7be56bf..70a8ffe 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -485,12 +485,12 @@ retry:
for(;;) {
UPDATE_CACHE(re, &s->gb);
GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
-if (run == 66 && level){
-CLOSE_READER(re, &s->gb);
-av_log(s->avctx, AV_LOG_ERROR, "illegal ac vlc code at %dx%d\n",
s->mb_x, s->mb_y);
-return -1;
-}
if (run == 66) {
+if (level){
+CLOSE_READER(re, &s->gb);
+av_log(s->avctx, AV_LOG_ERROR, "illegal ac vlc code at
%dx%d\n", s->mb_x, s->mb_y);
+return -1;
+}
/* escape */
if (CONFIG_FLV_DECODER && s->h263_flv > 1) {
int is11 = SHOW_UBITS(re, &s->gb, 1);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] h261dec, ituh263dec: ensure CLOSE_READER is done on error paths, too.
ffmpeg | branch: master | Reimar Döffinger | Sun Aug
31 21:39:22 2014 +0200| [36c0043344fd6d99e92f42cfd1d718a9272ad632] | committer:
Reimar Döffinger
h261dec, ituh263dec: ensure CLOSE_READER is done on error paths, too.
Signed-off-by: Reimar Döffinger
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36c0043344fd6d99e92f42cfd1d718a9272ad632
---
libavcodec/h261dec.c|2 ++
libavcodec/ituh263dec.c |4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index c9470b1..9b95775 100644
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -310,6 +310,7 @@ static int h261_decode_block(H261Context *h, int16_t
*block, int n, int coded)
UPDATE_CACHE(re, &s->gb);
GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TCOEFF_VLC_BITS, 2,
0);
if (run == 66 && level) {
+CLOSE_READER(re, &s->gb);
av_log(s->avctx, AV_LOG_ERROR, "illegal ac vlc code at %dx%d\n",
s->mb_x, s->mb_y);
return -1;
@@ -332,6 +333,7 @@ static int h261_decode_block(H261Context *h, int16_t
*block, int n, int coded)
}
i += run;
if (i >= 64) {
+CLOSE_READER(re, &s->gb);
av_log(s->avctx, AV_LOG_ERROR, "run overflow at %dx%d\n",
s->mb_x, s->mb_y);
return -1;
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index 168ac74..7be56bf 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -486,6 +486,7 @@ retry:
UPDATE_CACHE(re, &s->gb);
GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
if (run == 66 && level){
+CLOSE_READER(re, &s->gb);
av_log(s->avctx, AV_LOG_ERROR, "illegal ac vlc code at %dx%d\n",
s->mb_x, s->mb_y);
return -1;
}
@@ -531,6 +532,7 @@ retry:
}
i += run;
if (i >= 64){
+CLOSE_READER(re, &s->gb);
// redo update without last flag, revert -1 offset
i = i - run + ((run-1)&63) + 1;
if (i < 64) {
@@ -539,7 +541,6 @@ retry:
break;
}
if(s->alt_inter_vlc && rl == &ff_h263_rl_inter && !s->mb_intra){
-CLOSE_READER(re, &s->gb);
//Looks like a hack but no, it's the way it is supposed to
work ...
rl = &ff_rl_intra_aic;
i = 0;
@@ -553,7 +554,6 @@ retry:
j = scan_table[i];
block[j] = level;
}
-CLOSE_READER(re, &s->gb);
}
not_coded:
if (s->mb_intra && s->h263_aic) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] h261dec, ituh263dec: Avoid unnecessary -1 inside inner loop.
ffmpeg | branch: master | Reimar Döffinger | Sun Aug
31 20:30:04 2014 +0200| [2a00812d82c5f8a76328597c8b5ee1d4cd9c49dc] | committer:
Reimar Döffinger
h261dec, ituh263dec: Avoid unnecessary -1 inside inner loop.
3646 -> 3597 decicycles in inner loop when decoding
vsynth1-flv.
Signed-off-by: Reimar Döffinger
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a00812d82c5f8a76328597c8b5ee1d4cd9c49dc
---
libavcodec/h261dec.c|7 ---
libavcodec/ituh263dec.c |9 +
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index f286d23..c9470b1 100644
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -305,6 +305,7 @@ static int h261_decode_block(H261Context *h, int16_t
*block, int n, int coded)
}
{
OPEN_READER(re, &s->gb);
+i--; // offset by -1 to allow direct indexing of scan_table
for (;;) {
UPDATE_CACHE(re, &s->gb);
GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TCOEFF_VLC_BITS, 2,
0);
@@ -330,17 +331,17 @@ static int h261_decode_block(H261Context *h, int16_t
*block, int n, int coded)
SKIP_COUNTER(re, &s->gb, 1);
}
i += run;
-if (i > 64) {
+if (i >= 64) {
av_log(s->avctx, AV_LOG_ERROR, "run overflow at %dx%d\n",
s->mb_x, s->mb_y);
return -1;
}
-j= scan_table[i-1];
+j= scan_table[i];
block[j] = level;
}
CLOSE_READER(re, &s->gb);
}
-s->block_last_index[n] = i - 1;
+s->block_last_index[n] = i;
return 0;
}
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index ad5a3cb..168ac74 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -481,6 +481,7 @@ static int h263_decode_block(MpegEncContext * s, int16_t *
block,
retry:
{
OPEN_READER(re, &s->gb);
+i--; // offset by -1 to allow direct indexing of scan_table
for(;;) {
UPDATE_CACHE(re, &s->gb);
GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
@@ -529,9 +530,9 @@ retry:
SKIP_COUNTER(re, &s->gb, 1);
}
i += run;
-if (i > 64){
-// redo update without last flag
-i = i - run + ((run-1)&63);
+if (i >= 64){
+// redo update without last flag, revert -1 offset
+i = i - run + ((run-1)&63) + 1;
if (i < 64) {
// only last marker, no overrun
block[scan_table[i]] = level;
@@ -549,7 +550,7 @@ retry:
av_log(s->avctx, AV_LOG_ERROR, "run overflow at %dx%d i:%d\n",
s->mb_x, s->mb_y, s->mb_intra);
return -1;
}
-j = scan_table[i-1];
+j = scan_table[i];
block[j] = level;
}
CLOSE_READER(re, &s->gb);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/dvbsubdec: make compute_edt user settable
ffmpeg | branch: master | Michael Niedermayer | Mon Sep 1
04:13:48 2014 +0200| [a2dbf379f01b812ef96dc4d783025a1740572890] | committer:
Michael Niedermayer
avcodec/dvbsubdec: make compute_edt user settable
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2dbf379f01b812ef96dc4d783025a1740572890
---
ffmpeg.c |2 +-
libavcodec/dvbsubdec.c |3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index ff7961f..8bca9e7 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2298,7 +2298,7 @@ static int init_input_stream(int ist_index, char *error,
int error_len)
av_opt_set_int(ist->dec_ctx, "refcounted_frames", 1, 0);
if(ist->dec_ctx->codec_id == AV_CODEC_ID_DVB_SUBTITLE)
-av_dict_set(&ist->decoder_opts, "compute_edt", "1", 0);
+av_dict_set(&ist->decoder_opts, "compute_edt", "1",
AV_DICT_DONT_OVERWRITE);
if (!av_dict_get(ist->decoder_opts, "threads", NULL, 0))
av_dict_set(&ist->decoder_opts, "threads", "auto", 0);
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index 4cf5b02..097597e 100644
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@ -1585,8 +1585,9 @@ end:
return p - buf;
}
+#define DS AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_SUBTITLE_PARAM
static const AVOption options[] = {
-{"compute_edt", "compute end of time using pts or timeout",
offsetof(DVBSubContext, compute_edt), FF_OPT_TYPE_INT, {.i64 = 0}, 0, 1, 0},
+{"compute_edt", "compute end of time using pts or timeout",
offsetof(DVBSubContext, compute_edt), FF_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DS},
{NULL}
};
static const AVClass dvbsubdec_class = {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] ffmpeg: Enable compute_edt only when the subtitles are used for a output stream instead of a filter
ffmpeg | branch: master | Michael Niedermayer | Mon Sep 1
04:13:49 2014 +0200| [b01d2a5533a99cbd803159a4a7f365d12a0bc5c5] | committer:
Michael Niedermayer
ffmpeg: Enable compute_edt only when the subtitles are used for a output stream
instead of a filter
Fixes/works around Ticket3768
Reviewed-by: Nicolas George
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b01d2a5533a99cbd803159a4a7f365d12a0bc5c5
---
ffmpeg.c|8 ++--
ffmpeg.h|5 -
ffmpeg_filter.c |2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 8bca9e7..220816b 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2297,8 +2297,12 @@ static int init_input_stream(int ist_index, char *error,
int error_len)
ist->dec_ctx->thread_safe_callbacks = 1;
av_opt_set_int(ist->dec_ctx, "refcounted_frames", 1, 0);
-if(ist->dec_ctx->codec_id == AV_CODEC_ID_DVB_SUBTITLE)
+if (ist->dec_ctx->codec_id == AV_CODEC_ID_DVB_SUBTITLE &&
+ (ist->decoding_needed & DECODING_FOR_OST)) {
av_dict_set(&ist->decoder_opts, "compute_edt", "1",
AV_DICT_DONT_OVERWRITE);
+if (ist->decoding_needed & DECODING_FOR_FILTER)
+av_log(NULL, AV_LOG_WARNING, "Warning using DVB subtitles for
filtering and output at the same time is not fully supported, also see
-compute_edt [0|1]\n");
+}
if (!av_dict_get(ist->decoder_opts, "threads", NULL, 0))
av_dict_set(&ist->decoder_opts, "threads", "auto", 0);
@@ -2678,7 +2682,7 @@ static int transcode_init(void)
}
if (ist)
-ist->decoding_needed++;
+ist->decoding_needed |= DECODING_FOR_OST;
ost->encoding_needed = 1;
set_encoder_id(output_files[ost->file_index], ost);
diff --git a/ffmpeg.h b/ffmpeg.h
index 6545286..56eb66a 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -243,7 +243,10 @@ typedef struct InputStream {
AVStream *st;
int discard; /* true if stream data should be discarded */
int user_set_discard;
-int decoding_needed; /* true if the packets must be decoded in
'raw_fifo' */
+int decoding_needed; /* non zero if the packets must be decoded in
'raw_fifo', see DECODING_FOR_* */
+#define DECODING_FOR_OST1
+#define DECODING_FOR_FILTER 2
+
AVCodecContext *dec_ctx;
AVCodec *dec;
AVFrame *decoded_frame;
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 7acff28..93af8ce 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -275,7 +275,7 @@ static void init_input_filter(FilterGraph *fg,
AVFilterInOut *in)
av_assert0(ist);
ist->discard = 0;
-ist->decoding_needed++;
+ist->decoding_needed |= DECODING_FOR_FILTER;
ist->st->discard = AVDISCARD_NONE;
GROW_ARRAY(fg->inputs, fg->nb_inputs);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098'
ffmpeg | branch: master | Michael Niedermayer | Mon Sep 1 20:29:38 2014 +0200| [052cd1ce720406918181c00418609fc6c8697e3a] | committer: Michael Niedermayer Merge commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098' * commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098': dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer() Conflicts: libavcodec/dxva2_h264.c libavcodec/dxva2_mpeg2.c libavcodec/dxva2_vc1.c See: 64c53fa16aeca9cadd48ccf607803d6e4d26cc4d Merged-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=052cd1ce720406918181c00418609fc6c8697e3a --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer()
ffmpeg | branch: master | Diego Biurrun | Fri Aug 15
20:51:01 2014 +0200| [4600a85eaa6182e5a27464f6b9cae5a9ddbf3098] | committer:
Diego Biurrun
dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer()
This avoids related incompatible pointer type warnings.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4600a85eaa6182e5a27464f6b9cae5a9ddbf3098
---
libavcodec/dxva2_h264.c |7 +--
libavcodec/dxva2_mpeg2.c |5 -
libavcodec/dxva2_vc1.c |4 +++-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
index fa205c4..4132cd7 100644
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -297,6 +297,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext
*avctx,
const H264Picture *current_picture = h->cur_pic_ptr;
struct dxva2_picture_context *ctx_pic =
current_picture->hwaccel_picture_private;
DXVA_Slice_H264_Short *slice = NULL;
+void *dxva_data_ptr;
uint8_t *dxva_data, *current, *end;
unsigned dxva_size;
void *slice_data;
@@ -306,9 +307,11 @@ static int
commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
/* Create an annex B bitstream buffer with only slice NAL and finalize
slice */
if (FAILED(IDirectXVideoDecoder_GetBuffer(ctx->decoder,
- DXVA2_BitStreamDateBufferType,
- &dxva_data, &dxva_size)))
+ DXVA2_BitStreamDateBufferType,
+ &dxva_data_ptr, &dxva_size)))
return -1;
+
+dxva_data = dxva_data_ptr;
current = dxva_data;
end = dxva_data + dxva_size;
diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c
index f6ef5e5..65624e3 100644
--- a/libavcodec/dxva2_mpeg2.c
+++ b/libavcodec/dxva2_mpeg2.c
@@ -156,14 +156,17 @@ static int
commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
s->current_picture_ptr->hwaccel_picture_private;
const int is_field = s->picture_structure != PICT_FRAME;
const unsigned mb_count = s->mb_width * (s->mb_height >> is_field);
+void *dxva_data_ptr;
uint8_t *dxva_data, *current, *end;
unsigned dxva_size;
unsigned i;
if (FAILED(IDirectXVideoDecoder_GetBuffer(ctx->decoder,
DXVA2_BitStreamDateBufferType,
- &dxva_data, &dxva_size)))
+ &dxva_data_ptr, &dxva_size)))
return -1;
+
+dxva_data = dxva_data_ptr;
current = dxva_data;
end = dxva_data + dxva_size;
diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c
index 4f4dd17..1524b51 100644
--- a/libavcodec/dxva2_vc1.c
+++ b/libavcodec/dxva2_vc1.c
@@ -173,15 +173,17 @@ static int
commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
const unsigned padding = 128 - ((start_code_size + slice_size) & 127);
const unsigned data_size = start_code_size + slice_size + padding;
+void *dxva_data_ptr;
uint8_t *dxva_data;
unsigned dxva_size;
int result;
if (FAILED(IDirectXVideoDecoder_GetBuffer(ctx->decoder,
DXVA2_BitStreamDateBufferType,
- &dxva_data, &dxva_size)))
+ &dxva_data_ptr, &dxva_size)))
return -1;
+dxva_data = dxva_data_ptr;
result = data_size <= dxva_size ? 0 : -1;
if (!result) {
if (start_code_size > 0)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae'
ffmpeg | branch: master | Michael Niedermayer | Mon Sep 1 20:42:50 2014 +0200| [38c4316fff74ce51752ddb3722df619ecd2e8de6] | committer: Michael Niedermayer Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae' * commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae': dxva2: Clean up definition of _WIN32_WINNT Conflicts: libavcodec/dxva2.h See: 89946c8403752fbb26234d98f780188df8951a2e Merged-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38c4316fff74ce51752ddb3722df619ecd2e8de6 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] dxva2: Clean up definition of _WIN32_WINNT
ffmpeg | branch: master | Diego Biurrun | Fri Aug 15 21:01:15 2014 +0200| [b8962d64cc71af241601bcab5c3fcdc5735ef4ae] | committer: Diego Biurrun dxva2: Clean up definition of _WIN32_WINNT Only set a value if _WIN32_WINNT is undefined or smaller than 0x0600. This is cleaner than unconditional definition and avoids a number of redefinition warnings. Also only define a value in one of the two dxva2 headers. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b8962d64cc71af241601bcab5c3fcdc5735ef4ae --- libavcodec/dxva2.h |4 libavcodec/dxva2_internal.h |1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/dxva2.h b/libavcodec/dxva2.h index 78939be..d9017c6 100644 --- a/libavcodec/dxva2.h +++ b/libavcodec/dxva2.h @@ -29,7 +29,11 @@ * Public libavcodec DXVA2 header. */ +#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600 +#undef _WIN32_WINNT #define _WIN32_WINNT 0x0600 +#endif + #include #include #include diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index f35a076..b775e6c 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -23,7 +23,6 @@ #ifndef AVCODEC_DXVA_INTERNAL_H #define AVCODEC_DXVA_INTERNAL_H -#define _WIN32_WINNT 0x0600 #define COBJMACROS #include "config.h" ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2'
ffmpeg | branch: master | Michael Niedermayer | Mon Sep 1 20:51:31 2014 +0200| [f626eaa58e69532ff85044007b2ceb3ce8dd5ed2] | committer: Michael Niedermayer Merge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2' * commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2': aac_adtstoasc_bsf: Return proper error code Merged-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f626eaa58e69532ff85044007b2ceb3ce8dd5ed2 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] aac_adtstoasc_bsf: Return proper error code
ffmpeg | branch: master | Gabriel Dume | Fri Aug 29
22:43:43 2014 -0400| [63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2] | committer:
Diego Biurrun
aac_adtstoasc_bsf: Return proper error code
Signed-off-by: Diego Biurrun
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2
---
libavcodec/aac_adtstoasc_bsf.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c
index bec6e7f..733b08d 100644
--- a/libavcodec/aac_adtstoasc_bsf.c
+++ b/libavcodec/aac_adtstoasc_bsf.c
@@ -57,7 +57,7 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext
*bsfc,
if (avpriv_aac_parse_header(&gb, &hdr) < 0) {
av_log(avctx, AV_LOG_ERROR, "Error parsing ADTS frame header!\n");
-return -1;
+return AVERROR_INVALIDDATA;
}
if (!hdr.crc_absent && hdr.num_aac_frames > 1) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] mpeg4videodec: Fix low_delay error message
ffmpeg | branch: master | Gabriel Dume | Fri Aug 29
22:43:44 2014 -0400| [e205fe6831fe1b5445f7827b5c916425620b4ab5] | committer:
Diego Biurrun
mpeg4videodec: Fix low_delay error message
Signed-off-by: Diego Biurrun
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e205fe6831fe1b5445f7827b5c916425620b4ab5
---
libavcodec/mpeg4videodec.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index effbf6d..3adf0cf 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -2081,7 +2081,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx,
GetBitContext *gb)
s->pict_type = get_bits(gb, 2) + AV_PICTURE_TYPE_I;/* pict type: I
= 0 , P = 1 */
if (s->pict_type == AV_PICTURE_TYPE_B && s->low_delay &&
ctx->vol_control_parameters == 0 && !(s->flags &
CODEC_FLAG_LOW_DELAY)) {
-av_log(s->avctx, AV_LOG_ERROR, "low_delay flag incorrectly, clearing
it\n");
+av_log(s->avctx, AV_LOG_ERROR, "low_delay flag set incorrectly,
clearing it\n");
s->low_delay = 0;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5'
ffmpeg | branch: master | Michael Niedermayer | Mon Sep 1 21:01:10 2014 +0200| [f9aadf1fc426412e94c06f5d34516c8dba73cd6a] | committer: Michael Niedermayer Merge commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5' * commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5': mpeg4videodec: Fix low_delay error message Merged-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9aadf1fc426412e94c06f5d34516c8dba73cd6a --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Add missing changelog entry
ffmpeg | branch: master | Thomas Volkert | Mon Sep 1 21:18:49 2014 +0200| [f8164f6728a3cb8ca94845225b3b5dfa41c7daeb] | committer: Michael Niedermayer Add missing changelog entry Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f8164f6728a3cb8ca94845225b3b5dfa41c7daeb --- Changelog |1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index 95a4ccc..5a228f4 100644 --- a/Changelog +++ b/Changelog @@ -9,6 +9,7 @@ version : - support for using metadata in stream specifiers in fftools - LZMA compression support in TIFF decoder - support for H.261 RTP payload format (RFC 4587) +- support for HEVC/H.265 RTP payload format (draft v6) - depacketizing - added codecview filter to visualize information exported by some codecs - matroska 3d support thorugh side data ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc/filters.texi: fix filter name in examples
ffmpeg | branch: master | Mark Harris | Mon Sep 1 12:32:33 2014 -0700| [1b3a98f137900b6c3eb9a4c177d0b25684d6d144] | committer: Michael Niedermayer doc/filters.texi: fix filter name in examples Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b3a98f137900b6c3eb9a4c177d0b25684d6d144 --- doc/filters.texi |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index cca15fc..4ae5b4f 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -491,7 +491,7 @@ aeval=val(ch)/2:c=same @item Invert phase of the second channel: @example -eval=val(0)|-val(1) +aeval=val(0)|-val(1) @end example @end itemize @@ -9492,7 +9492,7 @@ Default value is "all", which will cycle through the list of all tests. Some examples: @example -testsrc=t=dc_luma +mptestsrc=t=dc_luma @end example will generate a "dc_luma" test pattern. ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Fix standalone compilation of the snow decoder.
ffmpeg | branch: master | Carl Eugen Hoyos | Mon Sep 1 23:30:57 2014 +0200| [7cf1f0f4af702a57f84ecfae31a604c5ebe3f81b] | committer: Carl Eugen Hoyos Fix standalone compilation of the snow decoder. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7cf1f0f4af702a57f84ecfae31a604c5ebe3f81b --- configure |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 80f2748..b41a54f 100755 --- a/configure +++ b/configure @@ -2177,7 +2177,7 @@ rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpeg_e rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo videodsp" shorten_decoder_select="golomb" sipr_decoder_select="lsp" -snow_decoder_select="dwt h264qpel hpeldsp rangecoder" +snow_decoder_select="dwt h264qpel hpeldsp me_cmp rangecoder videodsp" snow_encoder_select="aandcttables dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder" sonic_decoder_select="golomb rangecoder" sonic_encoder_select="golomb rangecoder" ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] build sys: enable the decoding_encoding example under the ffmpeg/doc/ examples
ffmpeg | branch: master | Rong Yan | Mon Sep 1 21:46:22 2014 -0400| [6abeaf2781ce4b7c84a93904003ab60b6d64cf27] | committer: Michael Niedermayer build sys: enable the decoding_encoding example under the ffmpeg/doc/examples Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6abeaf2781ce4b7c84a93904003ab60b6d64cf27 --- configure|1 + doc/Makefile |1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index b41a54f..8f0b915 100755 --- a/configure +++ b/configure @@ -2592,6 +2592,7 @@ zoompan_filter_deps="swscale" # examples avio_reading="avformat avcodec avutil" avcodec_example_deps="avcodec avutil" +decoding_encoding_example_deps="avcodec avformat avutil" demuxing_decoding_example_deps="avcodec avformat avutil" extract_mvs_example_deps="avcodec avformat avutil" filter_audio_example_deps="avfilter avutil" diff --git a/doc/Makefile b/doc/Makefile index 2fb9058..6f2812d 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -38,6 +38,7 @@ DOCS = $(DOCS-yes) DOC_EXAMPLES-$(CONFIG_AVIO_READING_EXAMPLE) += avio_reading DOC_EXAMPLES-$(CONFIG_AVCODEC_EXAMPLE) += avcodec +DOC_EXAMPLES-$(CONFIG_DECODING_ENCODING_EXAMPLE) += decoding_encoding DOC_EXAMPLES-$(CONFIG_DEMUXING_DECODING_EXAMPLE) += demuxing_decoding DOC_EXAMPLES-$(CONFIG_EXTRACT_MVS_EXAMPLE) += extract_mvs DOC_EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE) += filter_audio ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avutil/pixelutils: add small buffers tests
ffmpeg | branch: master | Clément Bœsch | Sun Aug 31 17:11:22
2014 +0200| [e6b125e3be19fb341fd9a759ad0af3b39ba35e0c] | committer: Clément
Bœsch
avutil/pixelutils: add small buffers tests
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6b125e3be19fb341fd9a759ad0af3b39ba35e0c
---
libavutil/pixelutils.c| 94 -
tests/ref/fate/pixelutils | 12 ++
2 files changed, 87 insertions(+), 19 deletions(-)
diff --git a/libavutil/pixelutils.c b/libavutil/pixelutils.c
index 10ff7e8..8f04024 100644
--- a/libavutil/pixelutils.c
+++ b/libavutil/pixelutils.c
@@ -91,6 +91,30 @@ av_pixelutils_sad_fn av_pixelutils_get_sad_fn(int w_bits,
int h_bits, int aligne
#define W2 640
#define H2 480
+static int run_single_test(const char *test,
+ const uint8_t *block1, ptrdiff_t stride1,
+ const uint8_t *block2, ptrdiff_t stride2,
+ int align, int n)
+{
+int out, ref;
+av_pixelutils_sad_fn f_ref = sad_c[n - 1];
+av_pixelutils_sad_fn f_out = av_pixelutils_get_sad_fn(n, n, align, NULL);
+
+switch (align) {
+case 0: block1++; block2++; break;
+case 1: block2++; break;
+case 2: break;
+}
+
+out = f_out(block1, stride1, block2, stride2);
+ref = f_ref(block1, stride1, block2, stride2);
+printf("[%s] [%c%c] SAD [%s] %dx%d=%d ref=%d\n",
+ out == ref ? "OK" : "FAIL",
+ align ? 'A' : 'U', align == 2 ? 'A' : 'U',
+ test, 1<>24;
-}
-for (i = 0; i < W2*H2; i++) {
-state = state * 1664525 + 1013904223;
-buf2[i] = state>>24;
-}
+#define RANDOM_INIT(buf, size) do { \
+int k; \
+for (k = 0; k < size; k++) {\
+state = state * 1664525 + 1013904223; \
+buf[k] = state>>24; \
+} \
+} while (0)
+
+/* Normal test with different strides */
+RANDOM_INIT(buf1, W1*H1);
+RANDOM_INIT(buf2, W2*H2);
ret = run_test("random", buf1, buf2);
if (ret < 0)
goto end;
+/* Check for maximum SAD */
memset(buf1, 0xff, W1*H1);
memset(buf2, 0x00, W2*H2);
ret = run_test("max", buf1, buf2);
if (ret < 0)
goto end;
+/* Check for minimum SAD */
memset(buf1, 0x90, W1*H1);
memset(buf2, 0x90, W2*H2);
ret = run_test("min", buf1, buf2);
+if (ret < 0)
+goto end;
+
+/* Exact buffer sizes, to check for overreads */
+for (i = 1; i <= 4; i++) {
+for (align = 0; align < 3; align++) {
+int size1, size2;
+
+av_freep(&buf1);
+av_freep(&buf2);
+
+size1 = size2 = 1 << (i << 1);
+
+switch (align) {
+case 0: size1++; size2++; break;
+case 1: size2++; break;
+case 2: break;
+}
+
+buf1 = av_malloc(size1);
+buf2 = av_malloc(size2);
+if (!buf1 || !buf2) {
+fprintf(stderr, "malloc failure\n");
+ret = 1;
+goto end;
+}
+RANDOM_INIT(buf1, size1);
+RANDOM_INIT(buf2, size2);
+ret = run_single_test("small", buf1, 1
[FFmpeg-cvslog] tools/normalize.py: both input and output file names are required
ffmpeg | branch: master | Mark Harris | Mon Sep 1 15:13:42 2014 -0700| [4cabee50f624de9b9bb074d8571abb0f06e0b635] | committer: Clément Bœsch tools/normalize.py: both input and output file names are required > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4cabee50f624de9b9bb074d8571abb0f06e0b635 --- tools/normalize.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/normalize.py b/tools/normalize.py index e015913..7d87c5e 100755 --- a/tools/normalize.py +++ b/tools/normalize.py @@ -2,7 +2,7 @@ import sys, subprocess -if len(sys.argv) > 1: +if len(sys.argv) > 2: ifile = sys.argv[1] encopt = sys.argv[2:-1] ofile = sys.argv[-1] ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
