Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Issue 22362007: Relocate last remnants of webkit/renderer/media code. (Closed)

Created:
7 years, 4 months ago by DaleCurtis
Modified:
7 years, 4 months ago
CC:
chromium-reviews, joi+watch-content_chromium.org, darin-cc_chromium.org, jam, feature-media-reviews_chromium.org
Visibility:
Public.

Description

Relocate last remnants of webkit/renderer/media code. - Moves webkit/renderer/media/crypto/ppapi/ to media/cdm/ppapi/ - Moves webkit/.../ppapi/cdm/ to media/cdm/ppapi/api/ - Moves everything in webkit_media to media namespace - Fixes broken builds with use_fake_video_decoder=1 or use_libvpx=1 - Deletes webkit/renderer/media folder (\o/) BUG=251306 TEST=Chrome builds with mentioned flags, plus branding=Chrome. TBR=rsleevi Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=216826

Patch Set 1 #

Total comments: 4

Patch Set 2 : Add comments. #

Patch Set 3 : Rebase. #

Patch Set 4 : Remove duplicate libvpx DEPS. #

Total comments: 2

Patch Set 5 : Restrict media, ppapi DEPS. #

Patch Set 6 : Make chromeos crypto dep explicit. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+147 lines, -4946 lines) Patch
M DEPS View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chrome/chrome_tests.gypi View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chromeos/chromeos.gyp View 1 2 3 4 5 1 chunk +1 line, -0 lines 0 comments Download
M content/content_tests.gypi View 1 2 1 chunk +1 line, -1 line 0 comments Download
M content/renderer/media/crypto/content_decryption_module_factory.cc View 1 chunk +1 line, -1 line 0 comments Download
A + media/cdm/DEPS View 0 chunks +-1 lines, --1 lines 0 comments Download
A + media/cdm/aes_decryptor.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + media/cdm/aes_decryptor.cc View 1 chunk +1 line, -1 line 0 comments Download
A + media/cdm/aes_decryptor_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
A media/cdm/ppapi/DEPS View 1 2 3 4 1 chunk +7 lines, -0 lines 0 comments Download
A + media/cdm/ppapi/cdm_video_decoder.h View 2 chunks +6 lines, -6 lines 0 comments Download
A + media/cdm/ppapi/cdm_video_decoder.cc View 2 chunks +6 lines, -7 lines 0 comments Download
A + media/cdm/ppapi/cdm_wrapper.cc View 4 chunks +5 lines, -5 lines 0 comments Download
A + media/cdm/ppapi/clear_key_cdm.h View 7 chunks +10 lines, -14 lines 0 comments Download
A + media/cdm/ppapi/clear_key_cdm.cc View 6 chunks +8 lines, -8 lines 0 comments Download
A + media/cdm/ppapi/fake_cdm_video_decoder.h View 2 chunks +8 lines, -8 lines 0 comments Download
A + media/cdm/ppapi/fake_cdm_video_decoder.cc View 2 chunks +3 lines, -4 lines 0 comments Download
A + media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h View 5 chunks +12 lines, -12 lines 0 comments Download
A + media/cdm/ppapi/ffmpeg_cdm_audio_decoder.cc View 15 chunks +17 lines, -18 lines 0 comments Download
A + media/cdm/ppapi/ffmpeg_cdm_video_decoder.h View 2 chunks +7 lines, -7 lines 0 comments Download
A + media/cdm/ppapi/ffmpeg_cdm_video_decoder.cc View 4 chunks +6 lines, -7 lines 0 comments Download
A + media/cdm/ppapi/libvpx_cdm_video_decoder.h View 2 chunks +7 lines, -7 lines 0 comments Download
A + media/cdm/ppapi/libvpx_cdm_video_decoder.cc View 4 chunks +8 lines, -9 lines 0 comments Download
A + media/cdm/ppapi/linked_ptr.h View 2 chunks +3 lines, -3 lines 0 comments Download
D media/crypto/DEPS View 1 chunk +0 lines, -3 lines 0 comments Download
D media/crypto/aes_decryptor.h View 1 chunk +0 lines, -124 lines 0 comments Download
D media/crypto/aes_decryptor.cc View 1 chunk +0 lines, -345 lines 0 comments Download
D media/crypto/aes_decryptor_unittest.cc View 1 chunk +0 lines, -664 lines 0 comments Download
M media/filters/pipeline_integration_test.cc View 1 chunk +1 line, -1 line 0 comments Download
M media/media.gyp View 1 2 3 chunks +6 lines, -3 lines 0 comments Download
A + media/media_cdm.gypi View 1 2 3 4 5 5 chunks +18 lines, -18 lines 0 comments Download
M ppapi/DEPS View 1 2 3 4 1 chunk +0 lines, -1 line 0 comments Download
M ppapi/shared_impl/DEPS View 1 2 3 4 1 chunk +1 line, -0 lines 0 comments Download
M third_party/widevine/cdm/widevine_cdm.gyp View 1 chunk +3 lines, -3 lines 0 comments Download
M webkit/DEPS View 1 1 chunk +0 lines, -1 line 0 comments Download
D webkit/renderer/media/DEPS View 1 chunk +0 lines, -3 lines 0 comments Download
D webkit/renderer/media/OWNERS View 1 chunk +0 lines, -9 lines 0 comments Download
D webkit/renderer/media/crypto/ppapi/DEPS View 1 chunk +0 lines, -4 lines 0 comments Download
D webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h View 1 chunk +0 lines, -43 lines 0 comments Download
D webkit/renderer/media/crypto/ppapi/cdm_video_decoder.cc View 1 chunk +0 lines, -57 lines 0 comments Download
D webkit/renderer/media/crypto/ppapi/cdm_wrapper.cc View 1 chunk +0 lines, -1198 lines 0 comments Download
D webkit/renderer/media/crypto/ppapi/clear_key_cdm.h View 1 chunk +0 lines, -170 lines 0 comments Download
D webkit/renderer/media/crypto/ppapi/clear_key_cdm.cc View 1 chunk +0 lines, -558 lines 0 comments Download
D webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.h View 1 chunk +0 lines, -41 lines 0 comments Download
D webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.cc View 1 chunk +0 lines, -92 lines 0 comments Download
D webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h View 1 chunk +0 lines, -99 lines 0 comments Download
D webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc View 1 chunk +0 lines, -413 lines 0 comments Download
D webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h View 1 chunk +0 lines, -58 lines 0 comments Download
D webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc View 1 chunk +0 lines, -345 lines 0 comments Download
D webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h View 1 chunk +0 lines, -55 lines 0 comments Download
D webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.cc View 1 chunk +0 lines, -196 lines 0 comments Download
D webkit/renderer/media/crypto/ppapi/linked_ptr.h View 1 chunk +0 lines, -185 lines 0 comments Download
D webkit/renderer/media/webkit_media.gypi View 1 chunk +0 lines, -136 lines 0 comments Download
M webkit/support/webkit_support.gyp View 1 2 1 chunk +0 lines, -1 line 0 comments Download
M webkit/support/webkit_support.gypi View 1 2 1 chunk +0 lines, -1 line 0 comments Download

Messages

Total messages: 25 (0 generated)
DaleCurtis
ddorwin: everything jamesr: webkit/ changes jam: content_tests.gypi change.
7 years, 4 months ago (2013-08-09 00:40:58 UTC) #1
ddorwin
Thanks! LGTM with comments. I suggest changing the description to "webkit/renderer/media/" instead of "webkit_media" since ...
7 years, 4 months ago (2013-08-09 01:10:38 UTC) #2
jamesr
Can you remove the +crypto line from src/webkit/DEPS and from webkit/support/webkit_support.gypi, or is something else ...
7 years, 4 months ago (2013-08-09 01:15:47 UTC) #3
jam
lgtm
7 years, 4 months ago (2013-08-09 15:51:38 UTC) #4
DaleCurtis
PTAL: - Updated title and description per ddorwin@ - Removed crypto from webkit DEPS and ...
7 years, 4 months ago (2013-08-09 18:29:38 UTC) #5
jamesr
Cool, webkit/ lgtm
7 years, 4 months ago (2013-08-09 18:31:02 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dalecurtis@chromium.org/22362007/8001
7 years, 4 months ago (2013-08-09 19:18:21 UTC) #7
commit-bot: I haz the power
Failed to apply patch for webkit/support/webkit_support.gyp: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...
7 years, 4 months ago (2013-08-09 19:19:12 UTC) #8
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dalecurtis@chromium.org/22362007/15001
7 years, 4 months ago (2013-08-09 19:38:02 UTC) #9
DaleCurtis
+dmichael for ppapi DEPS owners approval for movement from webkit/renderer/media/crypto/ppapi to media/cdm/ppapi/ TBR=rsleevi for directory ...
7 years, 4 months ago (2013-08-09 20:21:41 UTC) #10
dmichael (off chromium)
https://codereview.chromium.org/22362007/diff/21001/media/cdm/ppapi/DEPS File media/cdm/ppapi/DEPS (right): https://codereview.chromium.org/22362007/diff/21001/media/cdm/ppapi/DEPS#newcode4 media/cdm/ppapi/DEPS:4: "+ppapi", there's some stuff in ppapi that media/cdm/ppapi probably ...
7 years, 4 months ago (2013-08-09 20:25:55 UTC) #11
jamesr
On 2013/08/09 20:21:41, DaleCurtis wrote: > +dmichael for ppapi DEPS owners approval for movement from ...
7 years, 4 months ago (2013-08-09 20:29:59 UTC) #12
dmichael (off chromium)
On 2013/08/09 20:29:59, jamesr wrote: > On 2013/08/09 20:21:41, DaleCurtis wrote: > > +dmichael for ...
7 years, 4 months ago (2013-08-09 20:38:43 UTC) #13
DaleCurtis
TBR'd since the crypto/ DEPS was already in media/crypto which was renamed to media/cdm. Vice ...
7 years, 4 months ago (2013-08-09 20:41:39 UTC) #14
Ryan Sleevi
How'd I get roped in? DEPS is *, and I'm not an OWNER of the ...
7 years, 4 months ago (2013-08-09 20:43:24 UTC) #15
DaleCurtis
rsleevi: media/crypto/DEPS had a +crypto DEP and I moved it to media/cdm, as it seems ...
7 years, 4 months ago (2013-08-09 20:45:38 UTC) #16
DaleCurtis
dmichael: Latest patch set restricts both media and ppapi deps.
7 years, 4 months ago (2013-08-09 20:46:36 UTC) #17
Ryan Sleevi
Ah. In that case, LGTM.
7 years, 4 months ago (2013-08-09 20:47:59 UTC) #18
dmichael (off chromium)
lgtm
7 years, 4 months ago (2013-08-09 20:55:39 UTC) #19
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dalecurtis@chromium.org/22362007/35001
7 years, 4 months ago (2013-08-09 21:03:11 UTC) #20
commit-bot: I haz the power
Sorry for I got bad news for ya. Compile failed with a clobber build on ...
7 years, 4 months ago (2013-08-09 21:57:36 UTC) #21
DaleCurtis
Looks like chromeos/ had an implicit dependency on crypto/ +stevenjb to review chromeos.gyp change making ...
7 years, 4 months ago (2013-08-09 22:38:49 UTC) #22
stevenjb
chromeos/chromeos.gyp change LGTM
7 years, 4 months ago (2013-08-09 23:52:24 UTC) #23
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dalecurtis@chromium.org/22362007/31002
7 years, 4 months ago (2013-08-09 23:58:03 UTC) #24
commit-bot: I haz the power
7 years, 4 months ago (2013-08-10 08:21:32 UTC) #25
Message was sent while issue was closed.
Change committed as 216826

Powered by Google App Engine
This is Rietveld 408576698