Changeset 24

Timestamp:

11/27/04 08:21:40 (18 years ago)

Author:

pieterpalmers

Message:

- bugfix: descriptor was not read correctly in AvDescriptor?
- several other small bugfixes/cleanups
- fix compiler warnings
- added some extra debug statements to follow parser flow

Files:

• trunk/freebob/src/avdescriptor.cpp (modified) (3 diffs)
• trunk/freebob/src/avmusicstatusdescriptor.cpp (modified) (1 diff)
• trunk/freebob/src/avnameinfoblock.cpp (modified) (2 diffs)
• trunk/freebob/src/avoutputplugstatusinfoblock.cpp (modified) (1 diff)
• trunk/freebob/src/avsourcepluginfoblock.cpp (modified) (2 diffs)
• trunk/freebob/src/avsourcepluginfoblock.h (modified) (1 diff)
• trunk/freebob/src/ieee1394service.cpp (modified) (2 diffs)

trunk/freebob/src/avdescriptor.cpp

@@ -168 +168 @@
-        aContents=new unsigned char[iLength];
-        
+        /* there is a gap in the read data, because of the two bytes 
+         * that are before the third quadlet (why did 1394TA do that?)
+         * 
+         * proposed solution:
+         * 1) the first read is OK, because the length of the descriptor is in these two bytes,
+         *    so execute a read from address 0 with length=iLength
+         * 2) process the bytes starting from response[3]
+         * 3) the next reads should start from the end of the previous read minus 2. this way we 
+         *    can discard these two problem bytes, because they are already read in the previous 
+         *    run.
+         */
+        
+        // first read
+        if(bytes_read<iLength) {
+                fprintf(stderr,".");    
+                // apparently the lib modifies the request, so redefine it completely
+                request[0] = AVC1394_CTYPE_CONTROL | qTarget
+                                                | AVC1394_COMMAND_READ_DESCRIPTOR | (iType & 0xFF);
+                // the amount of bytes we want to read is:
+                //  total descriptor length + 2 bytes of the descriptor length field (i.e. the overlap bytes for this read)
+                request[1] = 0xFFFF0000 | (iLength)&0xFFFF;
+                request[2] = ((0) << 16) |0x0000FFFF;
+                
+                response =  cParent->avcExecuteTransaction(request, 3, 3);
+                data_length_read=(response[1]&0xFFFF);
+                read_result_status=((response[1]>>24)&0xFF);
+                
+                databuffer=(unsigned char *)(response+3);
+                
+                // the buffer starting at databuffer is two bytes smaller that the amount of bytes read
+                for (i=0;(i<data_length_read-2) && (bytes_read < iLength);i++) {
+                        *(aContents+bytes_read)=*(databuffer+i);
+                        bytes_read++;
+                }
+                
+        }
+        
+        // now do the remaining reads
-        while(bytes_read<iLength) {
-                fprintf(stderr,".");    
@@ -173 +211 @@
-                request[0] = AVC1394_CTYPE_CONTROL | qTarget
-                                                | AVC1394_COMMAND_READ_DESCRIPTOR | (iType & 0xFF);
-
+
+
+
-                request[2] = (((bytes_read)&0xFFFF) << 16) |0x0000FFFF;
+                
-                response =  cParent->avcExecuteTransaction(request, 3, 3);
-                data_length_read=(response[1]&0xFFFF);
-                read_result_status=((response[1]>>24)&0xFF);
+                
-                databuffer=(unsigned char *)(response+3);
-                
-
+-2
-                        *(aContents+bytes_read)=*(databuffer+i);
-                        bytes_read++;
-                }
+                
-        }
-        fprintf(stderr,"\n");   
@@ -256 +299 @@
-        }
-}
-   

trunk/freebob/src/avmusicstatusdescriptor.cpp

@@ -58 +58 @@
-        // PP: calculate the offset to accomodate for the presence of root lists [not implemented]
-        
-
+//
-        
-        // start parsing the optional capability stuff

trunk/freebob/src/avnameinfoblock.cpp

@@ -50 +50 @@
-        // PP: Can't find this in the specs I have... going to look around a bit for the spec this is in.
-        //     (AV/C Information Block Types Specification Version 1.0)
-        unsigned int namelen;
-        unsigned int readlen=0;
-        if (isValid()) {
@@ -57 +56 @@
-                // PP: for my device apparently one block is sufficient.
-                // PP: one strange thing remains, that is that there are some NULL characters in the buffer.
-
-
+// 
+// 
-                unsigned int primary_field_length_textblock_1=readWord(0x0E); // ?? I guess ??
-                

trunk/freebob/src/avoutputplugstatusinfoblock.cpp

@@ -42 +42 @@
-
-        debugPrint(DEBUG_LEVEL_INFO,"AvOutputPlugStatusInfoBlock: Creating... length=0x%04X\n",getLength());
+        debugPrint(DEBUG_LEVEL_INFO,"AvOutputPlugStatusInfoBlock:   Number of source plugs=%d\n",nb_sourceplugs);
-                
-        if (nb_sourceplugs>0) {
-                for (unsigned int i=0;i<nb_sourceplugs;i++) {
+                        debugPrint(DEBUG_LEVEL_INFO,"AvOutputPlugStatusInfoBlock: source plug=%d\n",i);
-                        tmpAvSourcePlugInfoBlock=new AvSourcePlugInfoBlock(parent, next_block_position);
-                        
-                        if (tmpAvSourcePlugInfoBlock && (tmpAvSourcePlugInfoBlock->isValid())) {
+                                //debugPrint(DEBUG_LEVEL_INFO,"AvOutputPlugStatusInfoBlock: source plug type=0x%04X\n",tmpAvSourcePlugInfoBlock->getType());
-                                next_block_position+=tmpAvSourcePlugInfoBlock->getLength()+2; // the 2 is due to the fact that the length of the length field of the infoblock isn't accounted for;
-                                
-                                // add to child list
-                                cSourcePlugs.push_back(tmpAvSourcePlugInfoBlock);
+                                
+                                tmpAvSourcePlugInfoBlock->printContents();
+                                
-                        } else {
-                                debugPrint(DEBUG_LEVEL_INFO,"AvOutputPlugStatusInfoBlock: Invalid block... parse error!\n");

trunk/freebob/src/avsourcepluginfoblock.cpp

@@ -48 +48 @@
-
-        // parse the child info blocks
-
+address+
-                debugPrint(DEBUG_LEVEL_INFO,"AvSourcePlugInfoBlock: Creating tmpInfoBlock\n");
-
@@ -132 +132 @@
-        }
-}
+
+void AvSourcePlugInfoBlock::printContents() {
+        if(cAudioInfoBlock) {
+                debugPrint(DEBUG_LEVEL_INFO,"AvSourcePlugInfoBlock: AudioInfoBlock: %s\n",cAudioInfoBlock->getName());
+        }
+        if(cMidiInfoBlock) {
+                debugPrint(DEBUG_LEVEL_INFO,"AvSourcePlugInfoBlock: MidiInfoBlock %d streams\n",cMidiInfoBlock->getNbStreams());
+                for (unsigned int i=0;i<cMidiInfoBlock->getNbStreams();i++) {
+                        debugPrint(DEBUG_LEVEL_INFO,"AvSourcePlugInfoBlock: MidiInfoBlock stream %d: %s\n",i,cMidiInfoBlock->getName(i));
+                }
+        }
+        if(cAudioSyncInfoBlock) {
+                debugPrint(DEBUG_LEVEL_INFO,"AvSourcePlugInfoBlock: AudioSyncInfoBlock can sync to: Bus? %s / External? %s\n",
+                        cAudioSyncInfoBlock->canSyncBus()?"yes":"no",
+                        cAudioSyncInfoBlock->canSyncExternal()?"yes":"no"
+                        );
+        }
+}

trunk/freebob/src/avsourcepluginfoblock.h

@@ -45 +45 @@
-        unsigned int getPlugNumber();
-
+        void printContents(); // to debug the parse process
+        
-protected:
-        //vector<AvNameInfoBlock*> cNameInfoBlocks;

trunk/freebob/src/ieee1394service.cpp

@@ -272 +272 @@
-                        debugPrint (DEBUG_LEVEL_INFO, "    Trying to create an AvMidiInfoBlock...\n");
-
-7
+9
-                        debugPrint (DEBUG_LEVEL_INFO, "     isValid? %s\n",(testblock5->isValid()?"yes":"no"));
-                        debugPrint (DEBUG_LEVEL_INFO, "      Length? 0x%04X (%d)\n",testblock5->getLength(),testblock5->getLength());
@@ -282 +282 @@
-                        
-                        debugPrint (DEBUG_LEVEL_INFO, "    Trying to create an AvAudioSyncInfoBlock...\n");
-0
+2
-                        debugPrint (DEBUG_LEVEL_INFO, "     isValid? %s\n",(testblock6->isValid()?"yes":"no"));
-                        debugPrint (DEBUG_LEVEL_INFO, "      canSyncBus? %s\n",(testblock6->canSyncBus()?"yes":"no"));