Add unit tests for ISO CENC (encrypted MP4).

Add unit tests for ISO CENC (encrypted MP4).

BUG=168852, 168930
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=176521

[xhwang, 2013-01-11 18:04:08]

https://codereview.chromium.org/11778086/diff/6001/media/filters/pipeline_int...
File media/filters/pipeline_integration_test.cc (right):

https://codereview.chromium.org/11778086/diff/6001/media/filters/pipeline_int...
media/filters/pipeline_integration_test.cc:179: if (type == "video/mp4") {
How about audio, is audio not encrypted? How about 
|| type == "audio/mp4" ?

https://codereview.chromium.org/11778086/diff/6001/media/filters/pipeline_int...
media/filters/pipeline_integration_test.cc:605:
DISABLED_MediaSource_ConfigChange_ClearThenEncrypted_MP4_CENC) {
comment says this test is "enctyped to clear" but this test name says
"ClearThenEncrypted"?

https://codereview.chromium.org/11778086/diff/6001/media/filters/pipeline_int...
media/filters/pipeline_integration_test.cc:636:
MediaSource_ConfigChange_EncryptedThenClear_MP4_CENC) {
ditto for comment and test name

https://codereview.chromium.org/11778086/diff/6001/media/filters/pipeline_int...
media/filters/pipeline_integration_test.cc:718: TEST_F(PipelineIntegrationTest,
EncryptedPlayback_MP4_CENC_VideoOnly) {
why this test needs proprietary codecs but the above (line 575) test doesn't?

[ddorwin, 2013-01-11 18:30:39]

Thanks. PTAL.

https://codereview.chromium.org/11778086/diff/6001/media/filters/pipeline_int...
File media/filters/pipeline_integration_test.cc (right):

https://codereview.chromium.org/11778086/diff/6001/media/filters/pipeline_int...
media/filters/pipeline_integration_test.cc:179: if (type == "video/mp4") {
On 2013/01/11 18:04:08, xhwang wrote:
> How about audio, is audio not encrypted? How about 
> || type == "audio/mp4" ?

Done.

https://codereview.chromium.org/11778086/diff/6001/media/filters/pipeline_int...
media/filters/pipeline_integration_test.cc:605:
DISABLED_MediaSource_ConfigChange_ClearThenEncrypted_MP4_CENC) {
On 2013/01/11 18:04:08, xhwang wrote:
> comment says this test is "enctyped to clear" but this test name says
> "ClearThenEncrypted"?

Done.

https://codereview.chromium.org/11778086/diff/6001/media/filters/pipeline_int...
media/filters/pipeline_integration_test.cc:636:
MediaSource_ConfigChange_EncryptedThenClear_MP4_CENC) {
On 2013/01/11 18:04:08, xhwang wrote:
> ditto for comment and test name

Done.

https://codereview.chromium.org/11778086/diff/6001/media/filters/pipeline_int...
media/filters/pipeline_integration_test.cc:718: TEST_F(PipelineIntegrationTest,
EncryptedPlayback_MP4_CENC_VideoOnly) {
On 2013/01/11 18:04:08, xhwang wrote:
> why this test needs proprietary codecs but the above (line 575) test doesn't?

The ifdef is at 550. :)

[xhwang, 2013-01-11 18:51:55]

lgtm

https://codereview.chromium.org/11778086/diff/6001/media/filters/pipeline_int...
File media/filters/pipeline_integration_test.cc (right):

https://codereview.chromium.org/11778086/diff/6001/media/filters/pipeline_int...
media/filters/pipeline_integration_test.cc:718: TEST_F(PipelineIntegrationTest,
EncryptedPlayback_MP4_CENC_VideoOnly) {
On 2013/01/11 18:30:39, ddorwin wrote:
> On 2013/01/11 18:04:08, xhwang wrote:
> > why this test needs proprietary codecs but the above (line 575) test
doesn't?
> 
> The ifdef is at 550. :)

Ah, okey then.

[strobe_, 2013-01-11 20:31:56]

lgtm

[commit-bot: I haz the power, 2013-01-11 20:32:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ddorwin@chromium.org/11778086/10002

[commit-bot: I haz the power, 2013-01-12 09:13:39]

Change committed as 176521