gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] /srv/bzr/gnash/rtmp r9656: Build everything again.


From: rob
Subject: [Gnash-commit] /srv/bzr/gnash/rtmp r9656: Build everything again.
Date: Mon, 22 Sep 2008 11:20:49 -0600
User-agent: Bazaar (1.5)

------------------------------------------------------------
revno: 9656
committer: address@hidden
branch nick: rtmp
timestamp: Mon 2008-09-22 11:20:49 -0600
message:
  Build everything again.
  Use shared_ptrs for FLV instead of real pointers.
modified:
  libamf/Makefile.am
  libamf/flv.cpp
  libamf/flv.h
  testsuite/libamf.all/test_flv.cpp
=== modified file 'libamf/Makefile.am'
--- a/libamf/Makefile.am        2008-09-20 04:29:36 +0000
+++ b/libamf/Makefile.am        2008-09-22 17:20:49 +0000
@@ -22,10 +22,10 @@
 libgnashamf_la_SOURCES = \
        amf.cpp \
        buffer.cpp \
-       element.cpp
-#      lcshm.cpp
-#      sol.cpp
-#      flv.cpp
+       element.cpp \
+       lcshm.cpp \
+       sol.cpp \
+       flv.cpp
 
 libgnashamf_la_LIBADD = \
        $(top_builddir)/libbase/libgnashbase.la

=== modified file 'libamf/flv.cpp'
--- a/libamf/flv.cpp    2008-09-22 15:11:10 +0000
+++ b/libamf/flv.cpp    2008-09-22 17:20:49 +0000
@@ -91,19 +91,21 @@
 {
 //    GNASH_REPORT_FUNCTION;
     boost::shared_ptr<flv_header_t> header(new flv_header_t);
-    
-    memcpy(header->reference(), buf->begin(), sizeof(Flv::flv_header_t));
+    memcpy(header.get(), buf->reference(), sizeof(flv_header_t));
+//    std::copy(buf->begin(), buf->begin() + sizeof(flv_header_t), 
header.get());
 
     // test the magic number
     if (memcmp(header->sig, "FLV", 3) != 0) {
        log_error("Bad magic number for FLV file!");
-       return 0;
+       header.reset();
+       return header;
     }
 
     // Make sure the version is legit, it should alwys be 1
     if (header->version != 0x1) {
        log_error("Bad version in FLV header! %d", _header.version);
-                 return 0;
+       header.reset();
+       return header;
     }
 
     // Make sure the type is set correctly
@@ -124,7 +126,7 @@
     // we should use it.
     if (ntohl(size) != 0x9) {
        log_error("Bad header size in FLV header! %d", size);
-                 return 0;
+       header.reset();
     }
     
     return header;
@@ -176,7 +178,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
     boost::shared_ptr<flv_audio_t> audio(new flv_audio_t);
-    memset(audio->reference(), 0, sizeof(flv_audio_t));
+//    memset(audio->reference(), 0, sizeof(flv_audio_t));
 
     // Get the sound type
     if (byte && Flv::AUDIO_STEREO) {
@@ -235,7 +237,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
     boost::shared_ptr<flv_video_t> video(new flv_video_t);
-    memset(video, 0, sizeof(flv_video_t));
+//    memset(video, 0, sizeof(flv_video_t));
 
     // Get the codecID codecID
     if (byte && Flv::VIDEO_H263) {
@@ -293,7 +295,8 @@
 {
 //    GNASH_REPORT_FUNCTION;
     boost::shared_ptr<flv_tag_t> tag(new flv_tag_t);
-    memcpy(tag, buf->reference(), sizeof(flv_tag_t));
+    memcpy(tag.get(), buf->reference(), sizeof(flv_tag_t));
+//    std::copy(buf->begin(), buf->end(), tag);
 
     // These fields are all 24 bit, big endian integers
     swapBytes(tag->bodysize, 3);

=== modified file 'libamf/flv.h'
--- a/libamf/flv.h      2008-09-22 15:11:10 +0000
+++ b/libamf/flv.h      2008-09-22 17:20:49 +0000
@@ -126,7 +126,7 @@
     // Encode the data into a Buffer
     boost::shared_ptr<amf::Buffer> encodeHeader(gnash::Network::byte_t type);
     // Decode a Buffer into a header
-    flv_header_t *decodeHeader(boost::shared_ptr<amf::Buffer> buf);
+    boost::shared_ptr<flv_header_t> 
decodeHeader(boost::shared_ptr<amf::Buffer> buf);
 
     // Decode a MetaData object, which is after the header, but before all the 
tags
     amf::Element *decodeMetaData(boost::shared_ptr<amf::Buffer> buf);
@@ -145,7 +145,7 @@
     
     void dump();
   private:
-//    flv_header_t                _header;
+    flv_header_t                _header;
 //    boost::uint32_t             _previous_tag_size;
     flv_tag_t                   _tag;
     std::vector<amf::Element *> _properties;

=== modified file 'testsuite/libamf.all/test_flv.cpp'
--- a/testsuite/libamf.all/test_flv.cpp 2008-09-22 01:03:07 +0000
+++ b/testsuite/libamf.all/test_flv.cpp 2008-09-22 17:20:49 +0000
@@ -133,8 +133,8 @@
 //     02 00 18 54 75 65 20 4a 75 6e 20 32 34 20 30 38 3a 30 33 3a 34 38 20 32 
30 30 38
 //  00 00 09                                   Tue Jun 24 08:03:48 2008
     boost::shared_ptr<amf::Buffer> hex1(new Buffer("46 4c 56 01 0d 00 00 00 09 
00 00 00 00"));
-    Flv::flv_header_t *head = flv.decodeHeader(hex1);
-    if (head == 0) {
+    boost::shared_ptr<Flv::flv_header_t> head = flv.decodeHeader(hex1);
+    if (!head) {
         notest = true;
     }
 
@@ -161,7 +161,7 @@
     } else {
         runtest.fail("Encoded FLV header");
     }
-    
+
     // Test converting 3 byte "integers" to a real 4 byte one. The
     // 0xf on each end should be ignore to be correct.
     boost::shared_ptr<amf::Buffer> hex2(new Buffer("0f 00 00 a4 0f"));
@@ -172,16 +172,15 @@
         runtest.fail("Flv::convert24()");
         notest = true;
     }
-
+    
     boost::shared_ptr<amf::Buffer> hex3(new Buffer("12 00 00 a4 00 00 00 00 00 
00 00"));
-    Flv::flv_tag_t *tag3 = flv.decodeTagHeader(hex3);
+    boost::shared_ptr<Flv::flv_tag_t> tag3 = flv.decodeTagHeader(hex3);
     if ((tag3->type == Flv::TAG_METADATA)
         && (flv.convert24(tag3->bodysize) == 164)) {
         runtest.pass("Decoded FLV MetaData header");
     } else {
         runtest.fail("Decoded FLV MetaData header");
     }
-    delete tag3;
 }
 
 void
@@ -210,8 +209,8 @@
 
     // Test decoding Audio tags
     boost::shared_ptr<amf::Buffer> hex2(new Buffer("09 00 00 00 00 00 00 00 00 
00 00 00"));
-    Flv::flv_tag_t *tag2 = flv.decodeTagHeader(hex2);
-    Flv::flv_audio_t *data2 = flv.decodeAudioData(*(hex2->reference() + 11));
+    boost::shared_ptr<Flv::flv_tag_t> tag2 = flv.decodeTagHeader(hex2);
+    boost::shared_ptr<Flv::flv_audio_t> data2 = 
flv.decodeAudioData(*(hex2->reference() + 11));
     if ((tag2->type && Flv::TAG_AUDIO)
         && (data2->type == Flv::AUDIO_MONO)
         && (data2->size == Flv::AUDIO_8BIT)
@@ -221,12 +220,10 @@
     } else {
         runtest.fail("Decoded FLV Audio Data flags");
     }
-    delete tag2;
-    delete data2;
 
     boost::shared_ptr<amf::Buffer> hex3(new Buffer("08 00 00 1b 00 00 00 00 00 
00 00 2a"));
-    Flv::flv_tag_t *tag3 = flv.decodeTagHeader(hex3);
-    Flv::flv_video_t *data3 = flv.decodeVideoData(*(hex3->reference() + 11));
+    boost::shared_ptr<Flv::flv_tag_t> tag3 = flv.decodeTagHeader(hex3);
+    boost::shared_ptr<Flv::flv_video_t> data3 = 
flv.decodeVideoData(*(hex3->reference() + 11));
     if ((tag3->type && Flv::TAG_VIDEO)
         && (data3->codecID == Flv::VIDEO_H263)
         && (data3->type == Flv::KEYFRAME)) {
@@ -234,8 +231,6 @@
     } else {
         runtest.fail("Decoded FLV Video Data flags");
     }
-    delete tag3;
-    delete data3;
 
     boost::shared_ptr<amf::Buffer> hex4(new Buffer("00 0a 6f 6e 4d 65 74 61 44 
61 74 61 08 00 00 00 00 00 08 64 75 72 61 74 69 6f 6e 00 40 6d 6e 24 dd 2f 1a 
a0 00 0c 76 69 64 65 6f 63 6f 64 65 63 69 64 00 40 00 00 00 00 00 00 00 00 0c 
61 75 64 69 6f 63 6f 64 65 63 69 64 00 40 00 00 00 00 00 00 00 00 0c 63 61 6e 
53 65 65 6b 54 6f 45 6e 64 01 00 00 09 63 72 65 61 74 65 64 62 79 02 00 07 46 
4d 53 20 33 2e 30 00 0c 63 72 65 61 74 69 6f 6e 64 61 74 65 02 00 18 54 75 65 
20 4a 75 6e 20 32 34 20 30 38 3a 30 33 3a 34 38 20 32 30 30 38 00 00 09"));
     Element *el4 = flv.decodeMetaData(hex4);


reply via email to

[Prev in Thread] Current Thread [Next in Thread]