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

Issue 10834033: Move AudioDevice and AudioInputDevice to media. (Closed)

Created:
8 years, 5 months ago by tommi (sloooow) - chröme
Modified:
8 years, 4 months ago
CC:
chromium-reviews
Visibility:
Public.

Description

Move AudioDevice and AudioInputDevice to media. This CL does the following: * Move AudioDevice, AudioInputDevice out of content, into media/audio. * ...and a couple of dependent classes: AudioDeviceThread and ScopedLoopObserver. * ...and the unit test. * Renamed AudioDevice -> AudioOutputDevice * Moved the classes into the media namespace. * Updated the unit test code as necessary. Aside from the unit test*, there are minimal code changes. Only what was required to make things build and work as before - mostly just adding or removing "media::". * The unit test changes were to add expectations for AddDelegate/RemoveDelegate since previously a mock class was inheriting from AudioMessageFilter and not the IPC interface. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=148777

Patch Set 1 #

Patch Set 2 : Update name of test suite and AddDelegate/RemoveDelegate expectations in AudioOutputDeviceTest #

Patch Set 3 : Check if git's got a move #

Patch Set 4 : #

Total comments: 4

Patch Set 5 : Addressed comments and fixed a few lint issues #

Unified diffs Side-by-side diffs Delta from patch set Stats (+284 lines, -1892 lines) Patch
M content/content_renderer.gypi View 1 2 3 2 chunks +0 lines, -8 lines 0 comments Download
M content/content_tests.gypi View 1 2 3 1 chunk +0 lines, -1 line 0 comments Download
D content/renderer/media/audio_device.h View 1 2 3 1 chunk +0 lines, -169 lines 0 comments Download
D content/renderer/media/audio_device.cc View 1 2 3 1 chunk +0 lines, -277 lines 0 comments Download
M content/renderer/media/audio_device_factory.h View 1 2 3 4 2 chunks +7 lines, -9 lines 0 comments Download
M content/renderer/media/audio_device_factory.cc View 1 2 3 2 chunks +6 lines, -6 lines 0 comments Download
D content/renderer/media/audio_device_thread.h View 1 2 3 1 chunk +0 lines, -107 lines 0 comments Download
D content/renderer/media/audio_device_thread.cc View 1 2 3 1 chunk +0 lines, -202 lines 0 comments Download
D content/renderer/media/audio_device_unittest.cc View 1 2 3 1 chunk +0 lines, -249 lines 0 comments Download
D content/renderer/media/audio_input_device.h View 1 2 3 1 chunk +0 lines, -207 lines 0 comments Download
D content/renderer/media/audio_input_device.cc View 1 2 3 1 chunk +0 lines, -343 lines 0 comments Download
M content/renderer/media/audio_renderer_mixer_manager.h View 1 2 3 1 chunk +2 lines, -2 lines 0 comments Download
M content/renderer/media/audio_renderer_mixer_manager_unittest.cc View 1 2 3 2 chunks +3 lines, -3 lines 0 comments Download
M content/renderer/media/render_audiosourceprovider.h View 1 2 3 1 chunk +2 lines, -2 lines 0 comments Download
M content/renderer/media/render_audiosourceprovider.cc View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
D content/renderer/media/scoped_loop_observer.h View 1 2 3 1 chunk +0 lines, -46 lines 0 comments Download
D content/renderer/media/scoped_loop_observer.cc View 1 2 3 1 chunk +0 lines, -43 lines 0 comments Download
M content/renderer/media/webrtc_audio_device_impl.h View 1 2 3 5 chunks +8 lines, -7 lines 0 comments Download
M content/renderer/media/webrtc_audio_device_impl.cc View 1 2 3 1 chunk +2 lines, -1 line 0 comments Download
M content/renderer/pepper/pepper_platform_audio_output_impl.h View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M content/renderer/renderer_webkitplatformsupport_impl.cc View 1 2 3 2 chunks +1 line, -1 line 0 comments Download
M content/test/webrtc_audio_device_test.cc View 1 2 3 1 chunk +1 line, -0 lines 0 comments Download
A + media/audio/audio_device_thread.h View 1 2 3 4 5 chunks +16 lines, -12 lines 0 comments Download
A + media/audio/audio_device_thread.cc View 1 2 3 4 4 chunks +8 lines, -2 lines 0 comments Download
A + media/audio/audio_input_device.h View 1 2 3 8 chunks +25 lines, -21 lines 0 comments Download
A + media/audio/audio_input_device.cc View 1 2 3 12 chunks +26 lines, -19 lines 0 comments Download
A + media/audio/audio_output_device.h View 1 2 3 4 6 chunks +31 lines, -39 lines 0 comments Download
A + media/audio/audio_output_device.cc View 1 2 3 14 chunks +51 lines, -48 lines 0 comments Download
A + media/audio/audio_output_device_unittest.cc View 1 2 3 9 chunks +64 lines, -56 lines 0 comments Download
M media/audio/audio_output_ipc.h View 1 2 3 2 chunks +4 lines, -4 lines 0 comments Download
M media/audio/mac/audio_manager_mac.cc View 1 2 3 4 2 chunks +3 lines, -1 line 0 comments Download
A + media/audio/scoped_loop_observer.h View 1 2 3 3 chunks +8 lines, -4 lines 0 comments Download
A + media/audio/scoped_loop_observer.cc View 1 2 3 2 chunks +5 lines, -1 line 0 comments Download
M media/media.gyp View 1 2 3 4 chunks +9 lines, -0 lines 0 comments Download

Messages

Total messages: 21 (0 generated)
tommi (sloooow) - chröme
Andrew and John: I need owners and the script picked out you guys as victims! ...
8 years, 5 months ago (2012-07-26 15:28:07 UTC) #1
jam
why is no change history preserved? i.e. why are the files "A" instead of "A+"?
8 years, 5 months ago (2012-07-26 15:34:43 UTC) #2
tommi (sloooow) - chröme
I don't know. I used "git mv" thinking that history would be properly preserved, should ...
8 years, 5 months ago (2012-07-26 15:38:01 UTC) #3
jam
On 2012/07/26 15:38:01, tommi wrote: > I don't know. I used "git mv" thinking that ...
8 years, 5 months ago (2012-07-26 15:55:06 UTC) #4
scherkus (not reviewing)
On 2012/07/26 15:55:06, John Abd-El-Malek wrote: > On 2012/07/26 15:38:01, tommi wrote: > > I ...
8 years, 5 months ago (2012-07-26 16:16:29 UTC) #5
scherkus (not reviewing)
lgtm but it'd be nice to get history preserved -- it's a bit hard to ...
8 years, 5 months ago (2012-07-26 17:19:01 UTC) #6
henrika (OOO until Aug 14)
Some info on the history stuff can be found here: https://groups.google.com/a/chromium.org/forum/?fromgroups#!searchin/chromium-dev/git$20mv/chromium-dev/zyHO54xG9Hk/_HyPO-uZobcJ On Thu, Jul 26, ...
8 years, 5 months ago (2012-07-27 07:35:02 UTC) #7
tommi (sloooow) - chröme
On 2012/07/27 07:35:02, henrika wrote: > Some info on the history stuff can be found ...
8 years, 5 months ago (2012-07-27 08:23:46 UTC) #8
tommi (sloooow) - chröme
will retry this using an svn repo. stay tuned.
8 years, 5 months ago (2012-07-27 08:24:14 UTC) #9
tommi (sloooow) - chröme
svn ftw! diffs show up correctly now and history preserved. ptal.
8 years, 5 months ago (2012-07-27 10:11:00 UTC) #10
henrika (OOO until Aug 14)
Whoa-oa-oa! I feel good, I knew that I would, now I feel good, I knew ...
8 years, 5 months ago (2012-07-27 11:08:49 UTC) #11
henrika (OOO until Aug 14)
https://chromiumcodereview.appspot.com/10834033/diff/10003/content/renderer/media/audio_device_factory.h File content/renderer/media/audio_device_factory.h (right): https://chromiumcodereview.appspot.com/10834033/diff/10003/content/renderer/media/audio_device_factory.h#newcode21 content/renderer/media/audio_device_factory.h:21: // This class uses the same pattern as content::RenderViewHostFactory. ...
8 years, 5 months ago (2012-07-27 11:08:57 UTC) #12
tommi (sloooow) - chröme
https://chromiumcodereview.appspot.com/10834033/diff/10003/content/renderer/media/audio_device_factory.h File content/renderer/media/audio_device_factory.h (right): https://chromiumcodereview.appspot.com/10834033/diff/10003/content/renderer/media/audio_device_factory.h#newcode21 content/renderer/media/audio_device_factory.h:21: // This class uses the same pattern as content::RenderViewHostFactory. ...
8 years, 4 months ago (2012-07-27 11:40:05 UTC) #13
jam
lgtm, thanks :)
8 years, 4 months ago (2012-07-27 16:12:31 UTC) #14
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/tommi@chromium.org/10834033/1065
8 years, 4 months ago (2012-07-27 16:42:51 UTC) #15
commit-bot: I haz the power
Failed to apply patch for media/audio/audio_device_thread.cc: While running patch -p0 --forward --force; patching file media/audio/audio_device_thread.cc ...
8 years, 4 months ago (2012-07-27 16:43:01 UTC) #16
tommi (sloooow) - chröme
On 2012/07/27 16:43:01, I haz the power (commit-bot) wrote: > Failed to apply patch for ...
8 years, 4 months ago (2012-07-27 16:45:32 UTC) #17
jam
On 2012/07/27 16:45:32, tommi wrote: > On 2012/07/27 16:43:01, I haz the power (commit-bot) wrote: ...
8 years, 4 months ago (2012-07-30 15:17:26 UTC) #18
tommi (sloooow) - chröme
Yes, I know that svn and cq work. :) What I think was the problem ...
8 years, 4 months ago (2012-07-30 15:44:35 UTC) #19
jam
On Mon, Jul 30, 2012 at 8:44 AM, Tommi <tommi@chromium.org> wrote: > Yes, I know ...
8 years, 4 months ago (2012-07-30 16:05:09 UTC) #20
tommi (sloooow) - chröme
8 years, 4 months ago (2012-07-30 16:39:59 UTC) #21
Nope, no conflicts, flew right in.


On Mon, Jul 30, 2012 at 6:05 PM, John Abd-El-Malek <jam@chromium.org> wrote:

>
>
> On Mon, Jul 30, 2012 at 8:44 AM, Tommi <tommi@chromium.org> wrote:
>
>> Yes, I know that svn and cq work. :)
>>
>> What I think was the problem was that since the cl started out with git,
>> that's how cq attempted to apply it.
>> Svn diff files are slightly different, so applying an svn patch with git
>> parameters (note the "-p0" in the output), is not going to work.
>> That's how I interpreted the output of the error at least.
>>
>
> oh, i always do patch -p0 -i foo.patch even when applying svn patches.
>
> I interpreted the output as a conflict. Out of curiosity, when you landed
> it manually, did you have conflicts that you had to merge?
>
>>
>> In any case, I simply landed the cl manually without problems.
>>
>>
>> On Mon, Jul 30, 2012 at 5:17 PM, <jam@chromium.org> wrote:
>>
>>> On 2012/07/27 16:45:32, tommi wrote:
>>>
>>>> On 2012/07/27 16:43:01, I haz the power (commit-bot) wrote:
>>>> > Failed to apply patch for media/audio/audio_device_**thread.cc:
>>>> > While running patch -p0 --forward --force;
>>>> > patching file media/audio/audio_device_**thread.cc
>>>> > Hunk #1 FAILED at 2.
>>>> > Hunk #2 FAILED at 13.
>>>> > Hunk #3 FAILED at 170.
>>>> > Hunk #4 FAILED at 200.
>>>> > 4 out of 4 hunks FAILED -- saving rejects to file
>>>> > media/audio/audio_device_**thread.cc.rej
>>>>
>>>
>>>  Looks like cq is expecting a git patch. I'll commit manually.
>>>>
>>>
>>> CQ works with svn. I think the issue is that there were conflicts that it
>>> couldn't resolve.
>>>
>>>
http://codereview.chromium.**org/10834033/<http://codereview.chromium.org/108...
>>>
>>
>>
>

Powered by Google App Engine
This is Rietveld 408576698