The e-retailer says it has agreements with just about every major music provider — including Sony, EMI, Universal, and Warner — giving it the right to offer streamed versions of songs found on a customer’s hard drive. Amazon will include this scan-and-match feature in its Cloud Player service, making it more competitive with Apple‘s iTunes Match. A free version of Cloud Player entitles a user to stream 250 songs along with others bought from Amazon, while a premium version costing $24.99 a year handles 250,000 songs plus Amazon purchases. The Cloud Player works with Amazon’s Kindle Fire as well as apps for iOS and Android devices. The company says it will soon also provide it through Roku and Sonos players. The deal with the record labels plus 150 independent distributors, aggregators and music publishers will enable Amazon to stream about 20M songs at 256 kilobits per second. Along with the change, Amazon is turning Cloud Drive into a separate service for file storage starting at $10 a year for 20 GB.

Get Deadline news and alerts sent to your inbox.