Merge "[RFC media]: refactoring several functions to C++ style"