Changeset 132
- Timestamp:
- 12/30/05 08:53:48 (18 years ago)
- Files:
-
- trunk/libfreebob/ChangeLog (modified) (1 diff)
- trunk/libfreebob/src/avdevice.cpp (modified) (4 diffs)
- trunk/libfreebob/src/libfreebobavc/avc_extended_stream_format.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libfreebob/ChangeLog
r131 r132 1 1 2005-12-30 Daniel Wagner <wagi@monom.org> 2 2 3 * src/libfreebobavc/avc_extended_stream_format.cpp (fire): Buffer 4 length increased. 5 3 6 * src/avdevice.cpp (discoverStep9): Error message extended. 7 More debug info added. 4 8 5 9 * src/debugmodule/debugmodule.h: Enable debugFatal, debugError and trunk/libfreebob/src/avdevice.cpp
r131 r132 1060 1060 { 1061 1061 debugError( "discoverStep9: Number of channels " 1062 "mismatch: plug discovring reported "1063 "%d channels , while stream format "1062 "mismatch: iso input plug %d discovering reported " 1063 "%d channels for cluster '%s', while stream format " 1064 1064 "reported %d\n", 1065 isoInputPlug->getPlugId(), 1065 1066 clusterInfo->m_nrOfChannels, 1066 streamFormatInfo->m_numberOfChannels ); 1067 clusterInfo->m_name.c_str(), 1068 streamFormatInfo->m_numberOfChannels); 1067 1069 return false; 1068 1070 } … … 1070 1072 1071 1073 debugOutput( DEBUG_LEVEL_VERBOSE, 1072 "iso input plug %d cluster info %d : stream format %d\n",1074 "iso input plug %d cluster info %d ('%s'): stream format %d\n", 1073 1075 isoInputPlug->getPlugId(), 1074 1076 i, 1077 clusterInfo->m_name.c_str(), 1075 1078 clusterInfo->m_streamFormat ); 1076 1079 } … … 1158 1161 streamFormatInfo->m_numberOfChannels ) 1159 1162 { 1160 debugError( "discoverStep9: Number of channels mismatch\n" ); 1163 debugError( "discoverStep9: Number of channels " 1164 "mismatch: iso output plug %d discovering reported " 1165 "%d channels for cluster '%s', while stream format " 1166 "reported %d\n", 1167 isoOutputPlug->getPlugId(), 1168 clusterInfo->m_nrOfChannels, 1169 clusterInfo->m_name.c_str(), 1170 streamFormatInfo->m_numberOfChannels); 1161 1171 return false; 1162 1172 } … … 1164 1174 1165 1175 debugOutput( DEBUG_LEVEL_VERBOSE, 1166 "iso output plug %d cluster info %d : stream format %d\n",1176 "iso output plug %d cluster info %d ('%s'): stream format %d\n", 1167 1177 isoOutputPlug->getPlugId(), 1168 1178 i, 1179 clusterInfo->m_name.c_str(), 1169 1180 clusterInfo->m_streamFormat ); 1170 1181 } trunk/libfreebob/src/libfreebobavc/avc_extended_stream_format.cpp
r125 r132 314 314 bool result = false; 315 315 316 #define STREAM_FORMAT_REQUEST_SIZE 6// XXX random length316 #define STREAM_FORMAT_REQUEST_SIZE 20 // XXX random length 317 317 union UPacket { 318 318 quadlet_t quadlet[STREAM_FORMAT_REQUEST_SIZE];