The Swiss, victor of 20 grand slam titles, will be hoping to compete in his fifth Olympic Games having made his debut at Sydney 2000.
Federer has won his home country tournament an incredible 9 times since he first triumphed in 2006 and few would bet against him making it 10 in 2019.
'At the end of the day, my heart decided I'd love to play the Olympic Games again.
"That's what people will say: "That's why he's playing, he needs to go and get the gold to fill out his trophy cabinet", Federer told CNN.
"I hope I will be healthy because in Rio I wasn't and that hurt".
"Every Olympic Games has been very, very special to me", he said, adding that he figured he may as well make the announcement "while I was actually in the city where the Olympics will take place". "And that is why I really hope I will be and I can not wait". He also has twice carried the Swiss flag in Olympic opening ceremonies before declining the honor in 2012.
The event at next year's Games falls between two Grand Slams, getting under way two weeks after the men's Wimbledon final.
Roger Federer presented on Monday he'll compete at next twelve months's Tokyo Olympics in a picture to express the men's singles gold medal, the most handy main prize he has yet to pick out.
World number one Novak Djokovic is among the competitors out to challenge Federer for Olympic gold.
Djokovic won the Japan Open earlier this month without dropping a set at Ariake Colosseum - the venue for the Olympic Games.
Djokovic left Rio in tears after a first round defeat to Juan Martin del Potro three years ago but travelled to the Tokyo Open for the first time a matter of weeks ago in order to get used to the conditions for next summer.
"I'd like to reach the final and go further than in Beijing".