equal
deleted
inserted
replaced
164 else |
164 else |
165 { |
165 { |
166 __V_SOURCESINK_CONTROLL( "CMccVideoSourceImpl::SourcePrimeL, prepare fully" ) |
166 __V_SOURCESINK_CONTROLL( "CMccVideoSourceImpl::SourcePrimeL, prepare fully" ) |
167 |
167 |
168 TUid encoderUid( KNullUid ); |
168 TUid encoderUid( KNullUid ); |
169 DoCodecSpecificConfigurationL( encoderUid ); |
169 TBool forceEncapsulationType( EFalse ); |
|
170 DoCodecSpecificConfigurationL( encoderUid, forceEncapsulationType ); |
170 |
171 |
171 __ASSERT_ALWAYS( iVideoCodecFourCC, User::Leave( KErrNotReady ) ); |
172 __ASSERT_ALWAYS( iVideoCodecFourCC, User::Leave( KErrNotReady ) ); |
172 |
173 |
173 __V_SOURCESINK_CONTROLL( "CMccVideoSourceImpl::SourcePrimeL, opening source" ) |
174 __V_SOURCESINK_CONTROLL( "CMccVideoSourceImpl::SourcePrimeL, opening source" ) |
174 iMediaRecorder->OpenL( iAudioSource, iCameraHandler->Handle(), |
175 iMediaRecorder->OpenL( iAudioSource, iCameraHandler->Handle(), |
175 *iVideoCodecFourCC, iAudioFourCC, encoderUid ) ; |
176 *iVideoCodecFourCC, iAudioFourCC, encoderUid, forceEncapsulationType ) ; |
176 } |
177 } |
177 } |
178 } |
178 else |
179 else |
179 { |
180 { |
180 __V_SOURCESINK_CONTROLL( "CMccVideoSourceImpl::SourcePrimeL, not priming" ) |
181 __V_SOURCESINK_CONTROLL( "CMccVideoSourceImpl::SourcePrimeL, not priming" ) |
1216 |
1217 |
1217 // --------------------------------------------------------------------------- |
1218 // --------------------------------------------------------------------------- |
1218 // CMccVideoSourceImpl::DoCodecSpecificConfigurationL |
1219 // CMccVideoSourceImpl::DoCodecSpecificConfigurationL |
1219 // --------------------------------------------------------------------------- |
1220 // --------------------------------------------------------------------------- |
1220 // |
1221 // |
1221 void CMccVideoSourceImpl::DoCodecSpecificConfigurationL( TUid& aEncoderUid ) |
1222 void CMccVideoSourceImpl::DoCodecSpecificConfigurationL( |
|
1223 TUid& aEncoderUid, TBool& aForceEncapsulationType ) |
1222 { |
1224 { |
1223 __V_SOURCESINK_CONTROLL( "CMccVideoSourceImpl::DoCodecSpecificConfigurationL" ) |
1225 __V_SOURCESINK_CONTROLL( "CMccVideoSourceImpl::DoCodecSpecificConfigurationL" ) |
1224 |
1226 |
1225 TBuf8<KMaxSdpNameLength> sdpName = iVideoCodec.iSdpName; |
1227 TBuf8<KMaxSdpNameLength> sdpName = iVideoCodec.iSdpName; |
1226 |
1228 |
1262 |
1264 |
1263 iMaxNegBitRate = iVideoCodec.iMaxBitrate; |
1265 iMaxNegBitRate = iVideoCodec.iMaxBitrate; |
1264 __V_SOURCESINK_CONTROLL_INT1( "CMccVideoSourceImpl::DoCodecSpecificConfigurationL, EncodingDecodingDeviceUid:", |
1266 __V_SOURCESINK_CONTROLL_INT1( "CMccVideoSourceImpl::DoCodecSpecificConfigurationL, EncodingDecodingDeviceUid:", |
1265 iVideoCodec.iEncodingDecodingDevice.iUid ) |
1267 iVideoCodec.iEncodingDecodingDevice.iUid ) |
1266 aEncoderUid = iVideoCodec.iEncodingDecodingDevice; |
1268 aEncoderUid = iVideoCodec.iEncodingDecodingDevice; |
|
1269 aForceEncapsulationType = ETrue; |
1267 } |
1270 } |
1268 else |
1271 else |
1269 { |
1272 { |
1270 // NOP |
1273 // NOP |
1271 } |
1274 } |