Benjamin Otte
2007-Nov-13 22:41 UTC
[Swfdec] 3 commits - libswfdec/swfdec_sound.c libswfdec/swfdec_sprite_movie.c test/trace
libswfdec/swfdec_sound.c | 2 +-
libswfdec/swfdec_sprite_movie.c | 4 +---
test/trace/loadvars-decode-5.swf |binary
test/trace/loadvars-decode-5.swf.trace | 6 ++++++
test/trace/loadvars-decode-6.swf |binary
test/trace/loadvars-decode-6.swf.trace | 6 ++++++
test/trace/loadvars-decode-7.swf |binary
test/trace/loadvars-decode-7.swf.trace | 6 ++++++
test/trace/loadvars-decode-8.swf |binary
test/trace/loadvars-decode-8.swf.trace | 6 ++++++
test/trace/loadvars-decode.as | 2 ++
11 files changed, 28 insertions(+), 4 deletions(-)
New commits:
commit 9bb29d6f9a3b29c843e905a842bce7f33698d705
Author: Andreas Henriksson <andreas at fatal.se>
Date: Tue Nov 13 23:38:51 2007 +0100
add another loadvars testcase string.
Add loadvars string found on www.aftonbladet.se that starts with a &,
which we had none of before.
diff --git a/test/trace/loadvars-decode-5.swf b/test/trace/loadvars-decode-5.swf
index a00a7f2..7db6990 100644
Binary files a/test/trace/loadvars-decode-5.swf and
b/test/trace/loadvars-decode-5.swf differ
diff --git a/test/trace/loadvars-decode-5.swf.trace
b/test/trace/loadvars-decode-5.swf.trace
index a3fde32..825e030 100644
--- a/test/trace/loadvars-decode-5.swf.trace
+++ b/test/trace/loadvars-decode-5.swf.trace
@@ -200,6 +200,12 @@ pSeats pServer = www.sf.se
pSplitSeats = false
pVip = false
+>>>
&dynimg=http://img.aftonbladet.se/special/webbtv/bilder2/Noje/0711/p1101779.jpg&dynurl=http://www.aftonbladet.se/atv2/init.html?id=categories/Noje/0711/8220&category=noje&commercial=yes
+category = noje
+commercial = yes
+decode =
+dynimg =
http://img.aftonbladet.se/special/webbtv/bilder2/Noje/0711/p1101779.jpg
+dynurl = http://www.aftonbladet.se/atv2/init.html?id=categories/Noje/0711/8220
>>> foo=bar
decode =
foo = bar
diff --git a/test/trace/loadvars-decode-6.swf b/test/trace/loadvars-decode-6.swf
index 0601a93..a81f21f 100644
Binary files a/test/trace/loadvars-decode-6.swf and
b/test/trace/loadvars-decode-6.swf differ
diff --git a/test/trace/loadvars-decode-6.swf.trace
b/test/trace/loadvars-decode-6.swf.trace
index fdfaf47..ad4b36a 100644
--- a/test/trace/loadvars-decode-6.swf.trace
+++ b/test/trace/loadvars-decode-6.swf.trace
@@ -200,6 +200,12 @@ pSeats pServer = www.sf.se
pSplitSeats = false
pVip = false
+>>>
&dynimg=http://img.aftonbladet.se/special/webbtv/bilder2/Noje/0711/p1101779.jpg&dynurl=http://www.aftonbladet.se/atv2/init.html?id=categories/Noje/0711/8220&category=noje&commercial=yes
+category = noje
+commercial = yes
+decode = [type Function]
+dynimg =
http://img.aftonbladet.se/special/webbtv/bilder2/Noje/0711/p1101779.jpg
+dynurl = http://www.aftonbladet.se/atv2/init.html?id=categories/Noje/0711/8220
>>> foo=bar
decode = [type Function]
foo = bar
diff --git a/test/trace/loadvars-decode-7.swf b/test/trace/loadvars-decode-7.swf
index 5541bb0..6aafd9b 100644
Binary files a/test/trace/loadvars-decode-7.swf and
b/test/trace/loadvars-decode-7.swf differ
diff --git a/test/trace/loadvars-decode-7.swf.trace
b/test/trace/loadvars-decode-7.swf.trace
index fdfaf47..ad4b36a 100644
--- a/test/trace/loadvars-decode-7.swf.trace
+++ b/test/trace/loadvars-decode-7.swf.trace
@@ -200,6 +200,12 @@ pSeats pServer = www.sf.se
pSplitSeats = false
pVip = false
+>>>
&dynimg=http://img.aftonbladet.se/special/webbtv/bilder2/Noje/0711/p1101779.jpg&dynurl=http://www.aftonbladet.se/atv2/init.html?id=categories/Noje/0711/8220&category=noje&commercial=yes
+category = noje
+commercial = yes
+decode = [type Function]
+dynimg =
http://img.aftonbladet.se/special/webbtv/bilder2/Noje/0711/p1101779.jpg
+dynurl = http://www.aftonbladet.se/atv2/init.html?id=categories/Noje/0711/8220
>>> foo=bar
decode = [type Function]
foo = bar
diff --git a/test/trace/loadvars-decode-8.swf b/test/trace/loadvars-decode-8.swf
index ee38532..b4ef5be 100644
Binary files a/test/trace/loadvars-decode-8.swf and
b/test/trace/loadvars-decode-8.swf differ
diff --git a/test/trace/loadvars-decode-8.swf.trace
b/test/trace/loadvars-decode-8.swf.trace
index fdfaf47..ad4b36a 100644
--- a/test/trace/loadvars-decode-8.swf.trace
+++ b/test/trace/loadvars-decode-8.swf.trace
@@ -200,6 +200,12 @@ pSeats pServer = www.sf.se
pSplitSeats = false
pVip = false
+>>>
&dynimg=http://img.aftonbladet.se/special/webbtv/bilder2/Noje/0711/p1101779.jpg&dynurl=http://www.aftonbladet.se/atv2/init.html?id=categories/Noje/0711/8220&category=noje&commercial=yes
+category = noje
+commercial = yes
+decode = [type Function]
+dynimg =
http://img.aftonbladet.se/special/webbtv/bilder2/Noje/0711/p1101779.jpg
+dynurl = http://www.aftonbladet.se/atv2/init.html?id=categories/Noje/0711/8220
>>> foo=bar
decode = [type Function]
foo = bar
diff --git a/test/trace/loadvars-decode.as b/test/trace/loadvars-decode.as
index ddb1305..60baa4e 100644
--- a/test/trace/loadvars-decode.as
+++ b/test/trace/loadvars-decode.as
@@ -71,6 +71,8 @@ tests = [
"txt=??MOBIL??GODIS&textcolor=%23ffffff&emcolor=%23fed63b&w=265&h=19",
"txt=??PRESENT-?? OCH
RABATTKORT&textcolor=%23ffffff&emcolor=%23fed63b&w=265&h=19",
"pHost=www.sf.se&pContextPath=/bio&pServer=www.sf.se&pPort=4001&pNumSeats=2&pSeats=&pSplitSeats=false&pAuditorium=2008_53&pVip=false&pListen=2008%2353%23200711131830&pNextUrl=/bio/Booking?cmd=showPaymentTypePage&pAbortUrl=/bio/Booking?cmd=listFilms",
+ // www.aftonbladet.se
+
"&dynimg=http://img.aftonbladet.se/special/webbtv/bilder2/Noje/0711/p1101779.jpg&dynurl=http://www.aftonbladet.se/atv2/init.html?id=categories/Noje/0711/8220&category=noje&commercial=yes",
// add more here.
commit c58ff55e210c0f8ffb74a3755e0c22599fcd333b
Author: Benjamin Otte <otte at gnome.org>
Date: Tue Nov 13 23:12:39 2007 +0100
off-by-one
diff --git a/libswfdec/swfdec_sound.c b/libswfdec/swfdec_sound.c
index 9dc13ad..830e40e 100644
--- a/libswfdec/swfdec_sound.c
+++ b/libswfdec/swfdec_sound.c
@@ -452,7 +452,7 @@ swfdec_sound_buffer_render_stereo (gint16 *dest, const
gint16 *source, guint off
source += 2;
n_samples -= offset;
}
- for (i = rate; i < n_samples; i += rate) {
+ for (i = rate; i <= n_samples; i += rate) {
for (j = 0; j < rate; j++) {
*dest++ = source[0];
*dest++ = source[1];
commit 155cde3d06f446d36c858e4478029cf825485c56
Author: Benjamin Otte <otte at gnome.org>
Date: Tue Nov 13 15:11:40 2007 +0100
remove annoying (and useless) debug message
diff --git a/libswfdec/swfdec_sprite_movie.c b/libswfdec/swfdec_sprite_movie.c
index 888c160..bc5768e 100644
--- a/libswfdec/swfdec_sprite_movie.c
+++ b/libswfdec/swfdec_sprite_movie.c
@@ -691,10 +691,8 @@ swfdec_sprite_movie_iterate_end (SwfdecMovie *mov)
if (movie->sprite == NULL)
return TRUE;
g_assert (movie->frame <= movie->n_frames);
- if (movie->frame == 0) {
- SWFDEC_WARNING ("not at first frame yet");
+ if (movie->frame == 0)
return TRUE;
- }
current = &movie->sprite->frames[movie->frame - 1];
/* then do the streaming thing */