r16 ./libvorbis: initial legwork for 1.2.0
Clint Adams
schizo at debian.org
Fri Jul 27 07:13:06 UTC 2007
------------------------------------------------------------
revno: 16
committer: Clint Adams <schizo at debian.org>
branch nick: libvorbis
timestamp: Fri 2007-07-27 03:13:06 -0400
message:
initial legwork for 1.2.0
removed:
debian/patches/upstream_r13198-fix_segfault_in_ov_time_seek.diff
added:
debian/patches/local-remove_nonfree_docs.diff
modified:
debian/README.Source
debian/changelog
debian/patches/series
-------------- next part --------------
=== removed file 'debian/patches/upstream_r13198-fix_segfault_in_ov_time_seek.diff'
--- a/debian/patches/upstream_r13198-fix_segfault_in_ov_time_seek.diff 2007-06-29 14:03:40 +0000
+++ b/debian/patches/upstream_r13198-fix_segfault_in_ov_time_seek.diff 1970-01-01 00:00:00 +0000
@@ -1,227 +0,0 @@
-Index: examples/seeking_example.c
-===================================================================
---- examples/seeking_example.c.orig 2005-11-28 00:43:25.000000000 -0500
-+++ examples/seeking_example.c 2007-06-29 09:53:08.474656407 -0400
-@@ -25,14 +25,15 @@
- # include <fcntl.h>
- #endif
-
--void _verify(OggVorbis_File *ov,ogg_int64_t pos,
-- ogg_int64_t val,ogg_int64_t pcmval,
-+void _verify(OggVorbis_File *ov,
-+ ogg_int64_t val,ogg_int64_t pcmval,double timeval,
- ogg_int64_t pcmlength,
- char *bigassbuffer){
- int j;
- long bread;
- char buffer[4096];
- int dummy;
-+ ogg_int64_t pos;
-
- /* verify the raw position, the pcm position and position decode */
- if(val!=-1 && ov_raw_tell(ov)<val){
-@@ -45,6 +46,11 @@
- (long)pcmval,(long)ov_pcm_tell(ov));
- exit(1);
- }
-+ if(timeval!=-1 && ov_time_tell(ov)>timeval){
-+ printf("time position out of tolerance: requested %f, got %f\n",
-+ timeval,ov_time_tell(ov));
-+ exit(1);
-+ }
- pos=ov_pcm_tell(ov);
- if(pos<0 || pos>pcmlength){
- printf("pcm position out of bounds: got %ld\n",(long)pos);
-@@ -73,6 +79,7 @@
- OggVorbis_File ov;
- int i,ret;
- ogg_int64_t pcmlength;
-+ double timelength;
- char *bigassbuffer;
- int dummy;
-
-@@ -106,6 +113,7 @@
- does what it claimed, decode the entire file into memory */
- fflush(stdout);
- pcmlength=ov_pcm_total(&ov,-1);
-+ timelength=ov_time_total(&ov,-1);
- bigassbuffer=malloc(pcmlength*2); /* w00t */
- i=0;
- while(i<pcmlength*2){
-@@ -120,9 +128,6 @@
- (long)(pcmlength*2-i));
- }
-
-- /* Exercise all the real seeking cases; ov_raw_seek,
-- ov_pcm_seek_page and ov_pcm_seek. time seek is just a wrapper
-- on pcm_seek */
- {
- ogg_int64_t length=ov.end;
- printf("\rtesting raw seeking to random places in %ld bytes....\n",
-@@ -130,7 +135,6 @@
-
- for(i=0;i<1000;i++){
- ogg_int64_t val=(double)rand()/RAND_MAX*length;
-- ogg_int64_t pos;
- printf("\r\t%d [raw position %ld]... ",i,(long)val);
- fflush(stdout);
- ret=ov_raw_seek(&ov,val);
-@@ -139,7 +143,7 @@
- exit(1);
- }
-
-- _verify(&ov,pos,val,-1,pcmlength,bigassbuffer);
-+ _verify(&ov,val,-1,-1.,pcmlength,bigassbuffer);
-
- }
- }
-@@ -151,7 +155,6 @@
-
- for(i=0;i<1000;i++){
- ogg_int64_t val=(double)rand()/RAND_MAX*pcmlength;
-- ogg_int64_t pos;
- printf("\r\t%d [pcm position %ld]... ",i,(long)val);
- fflush(stdout);
- ret=ov_pcm_seek_page(&ov,val);
-@@ -160,20 +163,18 @@
- exit(1);
- }
-
-- _verify(&ov,pos,-1,val,pcmlength,bigassbuffer);
-+ _verify(&ov,-1,val,-1.,pcmlength,bigassbuffer);
-
- }
- }
-
- printf("\r");
- {
-- ogg_int64_t length=ov.end;
- printf("testing pcm exact seeking to random places in %ld samples....\n",
- (long)pcmlength);
-
- for(i=0;i<1000;i++){
- ogg_int64_t val=(double)rand()/RAND_MAX*pcmlength;
-- ogg_int64_t pos;
- printf("\r\t%d [pcm position %ld]... ",i,(long)val);
- fflush(stdout);
- ret=ov_pcm_seek(&ov,val);
-@@ -187,7 +188,52 @@
- exit(1);
- }
-
-- _verify(&ov,pos,-1,val,pcmlength,bigassbuffer);
-+ _verify(&ov,-1,val,-1.,pcmlength,bigassbuffer);
-+
-+ }
-+ }
-+
-+ printf("\r");
-+ {
-+ printf("testing time page seeking to random places in %f seconds....\n",
-+ timelength);
-+
-+ for(i=0;i<1000;i++){
-+ double val=(double)rand()/RAND_MAX*timelength;
-+ printf("\r\t%d [time position %f]... ",i,val);
-+ fflush(stdout);
-+ ret=ov_time_seek_page(&ov,val);
-+ if(ret<0){
-+ printf("seek failed: %d\n",ret);
-+ exit(1);
-+ }
-+
-+ _verify(&ov,-1,-1,val,pcmlength,bigassbuffer);
-+
-+ }
-+ }
-+
-+ printf("\r");
-+ {
-+ printf("testing time exact seeking to random places in %f seconds....\n",
-+ timelength);
-+
-+ for(i=0;i<1000;i++){
-+ double val=(double)rand()/RAND_MAX*timelength;
-+ printf("\r\t%d [time position %f]... ",i,val);
-+ fflush(stdout);
-+ ret=ov_time_seek(&ov,val);
-+ if(ret<0){
-+ printf("seek failed: %d\n",ret);
-+ exit(1);
-+ }
-+ if(ov_time_tell(&ov)<val-1 || ov_time_tell(&ov)>val+1){
-+ printf("Declared position didn't perfectly match request: %f != %f\n",
-+ val,ov_time_tell(&ov));
-+ exit(1);
-+ }
-+
-+ _verify(&ov,-1,-1,val,pcmlength,bigassbuffer);
-
- }
- }
-Index: lib/vorbisfile.c
-===================================================================
---- lib/vorbisfile.c.orig 2005-11-28 00:43:25.000000000 -0500
-+++ lib/vorbisfile.c 2007-06-29 09:53:08.474656407 -0400
-@@ -1360,20 +1360,23 @@
- /* translate time to PCM position and call ov_pcm_seek */
-
- int link=-1;
-- ogg_int64_t pcm_total=ov_pcm_total(vf,-1);
-- double time_total=ov_time_total(vf,-1);
-+ ogg_int64_t pcm_total=0;
-+ double time_total=0.;
-
- if(vf->ready_state<OPENED)return(OV_EINVAL);
- if(!vf->seekable)return(OV_ENOSEEK);
-- if(seconds<0 || seconds>time_total)return(OV_EINVAL);
-+ if(seconds<0)return(OV_EINVAL);
-
- /* which bitstream section does this time offset occur in? */
-- for(link=vf->links-1;link>=0;link--){
-- pcm_total-=vf->pcmlengths[link*2+1];
-- time_total-=ov_time_total(vf,link);
-- if(seconds>=time_total)break;
-+ for(link=0;link<vf->links;link++){
-+ double addsec = ov_time_total(vf,link);
-+ if(seconds<time_total+addsec)break;
-+ time_total+=addsec;
-+ pcm_total+=vf->pcmlengths[link*2+1];
- }
-
-+ if(link==vf->links)return(OV_EINVAL);
-+
- /* enough information to convert time offset to pcm offset */
- {
- ogg_int64_t target=pcm_total+(seconds-time_total)*vf->vi[link].rate;
-@@ -1387,20 +1390,23 @@
- /* translate time to PCM position and call ov_pcm_seek */
-
- int link=-1;
-- ogg_int64_t pcm_total=ov_pcm_total(vf,-1);
-- double time_total=ov_time_total(vf,-1);
-+ ogg_int64_t pcm_total=0;
-+ double time_total=0.;
-
- if(vf->ready_state<OPENED)return(OV_EINVAL);
- if(!vf->seekable)return(OV_ENOSEEK);
-- if(seconds<0 || seconds>time_total)return(OV_EINVAL);
-+ if(seconds<0)return(OV_EINVAL);
-
- /* which bitstream section does this time offset occur in? */
-- for(link=vf->links-1;link>=0;link--){
-- pcm_total-=vf->pcmlengths[link*2+1];
-- time_total-=ov_time_total(vf,link);
-- if(seconds>=time_total)break;
-+ for(link=0;link<vf->links;link++){
-+ double addsec = ov_time_total(vf,link);
-+ if(seconds<time_total+addsec)break;
-+ time_total+=addsec;
-+ pcm_total+=vf->pcmlengths[link*2+1];
- }
-
-+ if(link==vf->links)return(OV_EINVAL);
-+
- /* enough information to convert time offset to pcm offset */
- {
- ogg_int64_t target=pcm_total+(seconds-time_total)*vf->vi[link].rate;
=== added file 'debian/patches/local-remove_nonfree_docs.diff'
--- a/debian/patches/local-remove_nonfree_docs.diff 1970-01-01 00:00:00 +0000
+++ b/debian/patches/local-remove_nonfree_docs.diff 2007-07-27 07:13:06 +0000
@@ -0,0 +1,55 @@
+--- libvorbis-1.2.0.dfsg.orig/doc/Makefile.am
++++ libvorbis-1.2.0.dfsg/doc/Makefile.am
+@@ -6,8 +6,6 @@
+
+ ### all of the static docs, commited to SVN and included as is
+ static_docs = \
+- draft-ietf-avt-rtp-vorbis-06.xml \
+- draft-ietf-avt-rtp-vorbis-06.txt \
+ eightphase.png \
+ evenlsp.png \
+ floor1_inverse_dB_table.html \
+@@ -100,10 +98,6 @@
+ $(BUILDDIR)/Vorbis_I_spec.xml: $(doc_sources)
+ @mkdir -p $(BUILDDIR)
+ @for file in $(doc_sources); do cp $(srcdir)/$$file $(BUILDDIR); done
+-# translate the draft rtp.txt to .xml in the BUILDDIR
+-$(BUILDDIR)/draft-rtp.xml: draft-ietf-avt-rtp-vorbis-05.txt
+- cat $< | sed 's/ //g' > $@
+-# cat $< | sed 's/ //g' | sed 's/</\</g' | sed 's/>/\>/g' > $@
+
+ # explicit rules for generating docs
+ if BUILD_DOCS
+--- libvorbis-1.2.0.dfsg.orig/doc/Makefile.in
++++ libvorbis-1.2.0.dfsg/doc/Makefile.in
+@@ -201,8 +201,6 @@
+
+ ### all of the static docs, commited to SVN and included as is
+ static_docs = \
+- draft-ietf-avt-rtp-vorbis-06.xml \
+- draft-ietf-avt-rtp-vorbis-06.txt \
+ eightphase.png \
+ evenlsp.png \
+ floor1_inverse_dB_table.html \
+@@ -628,10 +626,6 @@
+ $(BUILDDIR)/Vorbis_I_spec.xml: $(doc_sources)
+ @mkdir -p $(BUILDDIR)
+ @for file in $(doc_sources); do cp $(srcdir)/$$file $(BUILDDIR); done
+-# translate the draft rtp.txt to .xml in the BUILDDIR
+-$(BUILDDIR)/draft-rtp.xml: draft-ietf-avt-rtp-vorbis-05.txt
+- cat $< | sed 's/ //g' > $@
+-# cat $< | sed 's/ //g' | sed 's/</\</g' | sed 's/>/\>/g' > $@
+
+ # explicit rules for generating docs
+ @BUILD_DOCS_TRUE at Vorbis_I_spec.html: $(SPEC_PNG_BUILD) $(BUILDDIR)/Vorbis_I_spec.xml
+--- libvorbis-1.2.0.dfsg.orig/doc/index.html
++++ libvorbis-1.2.0.dfsg/doc/index.html
+@@ -84,8 +84,6 @@
+ <li>Vorbis I specification [<a href="Vorbis_I_spec.html">html</a>]
+ [<a href="Vorbis_I_spec.pdf">pdf</a>]</li>
+ <li><a href="v-comment.html">Vorbis comment header specification</a></li>
+-<li><a href="draft-ietf-avt-rtp-vorbis-06.txt">Embedding Vorbis encoded
+-audio in an RTP payload format</a></li>
+ </ul>
+
+ <h2>Ogg Vorbis programming documents</h2>
=== modified file 'debian/README.Source'
--- a/debian/README.Source 2007-06-29 18:19:01 +0000
+++ b/debian/README.Source 2007-07-27 07:13:06 +0000
@@ -2,6 +2,7 @@
"dfsg" version:
remove doc/draft-kerr-avt-vorbis-rtp-03.txt
+remove doc/draft-kerr-avt-vorbis-rtp-03.xml
-This file is a draft RFC that is not licensed under a DFSG license,
-so cannot be included in Debian.
+These files are a draft RFC that is not licensed under a
+DFSG-free license, so cannot be included in Debian.
=== modified file 'debian/changelog'
--- a/debian/changelog 2007-06-29 18:18:41 +0000
+++ b/debian/changelog 2007-07-27 07:13:06 +0000
@@ -1,8 +1,13 @@
-libvorbis (1.1.2.dfsg-3) UNRELEASED; urgency=low
+libvorbis (1.2.0.dfsg-1) UNRELEASED; urgency=low
+ [ Adeodato Sim ]
* Use ${binary:Version} instead of ${Source-Version}.
- -- Adeodato Sim <dato at net.com.org.es> Fri, 29 Jun 2007 20:09:32 +0200
+ [ Clint Adams ]
+ * New upstream release.
+ - Remove upstream_r13198-fix_segfault_in_ov_time_seek.diff .
+
+ -- Clint Adams <schizo at debian.org> Fri, 27 Jul 2007 02:57:44 -0400
libvorbis (1.1.2.dfsg-2) unstable; urgency=low
=== modified file 'debian/patches/series'
--- a/debian/patches/series 2007-06-29 14:03:40 +0000
+++ b/debian/patches/series 2007-07-27 07:13:06 +0000
@@ -1,1 +1,1 @@
-upstream_r13198-fix_segfault_in_ov_time_seek.diff -p0
+local-remove_nonfree_docs.diff
More information about the pkg-xiph-commits
mailing list