I'm holding a Philippine passport but a permanent resident in singapore. I have a 6.5 hour layover in Shanghai before my flight to Los Angeles, USA. Do I need any form of visa if:

1. I stay inside the airport while waiting for my LA flight

2. I decide to leave the airport to do some sightseeing in the city