Use 'pssh' data to determine key_id properly
commit3b08f4973d951753a94c51ec934e01ff3a214a04
authorjrummell <jrummell@chromium.org>
Sat, 20 Jun 2015 00:47:34 +0000 (19 17:47 -0700)
committerCommit bot <commit-bot@chromium.org>
Sat, 20 Jun 2015 00:48:18 +0000 (20 00:48 +0000)
tree07c7b665242a6d6a14535adc8a8bfc4150bf208f
parent4e2ecb71332584b846862653ac1b8ea2490b29b7
Use 'pssh' data to determine key_id properly

Required regenerating the test files to use Common System format
for the relevant 'pssh' box.

BUG=460308
TEST=modified tests pass

Review URL: https://codereview.chromium.org/1163713007

Cr-Commit-Position: refs/heads/master@{#335405}
14 files changed:
media/cdm/cenc_utils.cc
media/cdm/cenc_utils.h
media/cdm/cenc_utils_unittest.cc
media/test/data/bear-1280x720-a_frag-cenc-key_rotation.mp4
media/test/data/bear-1280x720-a_frag-cenc.mp4
media/test/data/bear-1280x720-a_frag-cenc_clear-all.mp4
media/test/data/bear-1280x720-v_frag-cenc-key_rotation.mp4
media/test/data/bear-1280x720-v_frag-cenc.mp4
media/test/data/bear-1280x720-v_frag-cenc_clear-all.mp4
media/test/data/bear-640x360-a_frag-cenc-key_rotation.mp4
media/test/data/bear-640x360-a_frag-cenc.mp4
media/test/data/bear-640x360-v_frag-cenc-key_rotation.mp4
media/test/data/bear-640x360-v_frag-cenc.mp4
media/test/pipeline_integration_test.cc