diff options
| author | timav <timav@chromium.org> | 2015-09-30 10:31:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-30 17:31:59 +0000 |
| commit | bb1063aada4db17a35d6825a3be5ec464bc54593 (patch) | |
| tree | 0eeaf94da8eb0e420d28e11b504e32c905727164 /media/media.gyp | |
| parent | 1fb23d444bce951a4c169e0e06589fc2c147ec2d (diff) | |
| download | chromium_src-bb1063aada4db17a35d6825a3be5ec464bc54593.zip chromium_src-bb1063aada4db17a35d6825a3be5ec464bc54593.tar.gz chromium_src-bb1063aada4db17a35d6825a3be5ec464bc54593.tar.bz2 | |
Prepare MediaDrmBridge to work with MediaCodecPlayer
This CL is a prerequisite for MediaCodecPlayer stage 7 (DRM)
https://codereview.chromium.org/1344133002/
If the MediaCodecPlayer we post the callback that the MediaCrypto
is ready and all PlayerTracker related callbacks to the media
thread. We also delete the MediaDrmBridge on the media thread.
As a result we create the MediaCrypto object on UI thread
and pass it to the MediaCodec.configure() on media thread.
BUG=407577
Review URL: https://codereview.chromium.org/1341883003
Cr-Commit-Position: refs/heads/master@{#351588}
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index ead9da0..a136093 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1865,6 +1865,8 @@ 'base/android/media_resource_getter.h', 'base/android/media_source_player.cc', 'base/android/media_source_player.h', + 'base/android/media_task_runner.cc', + 'base/android/media_task_runner.h', 'base/android/media_url_interceptor.h', 'base/android/video_decoder_job.cc', 'base/android/video_decoder_job.h', |