Merge "Refactor file decoding, implement video view"