Hopefully this does not make it to the core. To include advanced media I'd rather use 3rd party service and use oEmbed to enable rich media content. To keep content clean and independant avoid using shortcodes