media/mojo/services/mojo_decoder_factory.cc - Issue 1899363002: Finish plumbing MojoVideoDecoder.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: media/mojo/services/mojo_decoder_factory.cc

Issue 1899363002: Finish plumbing MojoVideoDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and strip down. Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« media/mojo/interfaces/video_decoder.mojom ('K') | « media/mojo/services/mojo_decoder_factory.h ('k') | media/mojo/services/mojo_media_client.h » ('j') | media/mojo/services/mojo_video_decoder_service.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "media/mojo/services/mojo_decoder_factory.h"	5 #include "media/mojo/services/mojo_decoder_factory.h"

6	6

7 #include "base/single_thread_task_runner.h"	7 #include "base/single_thread_task_runner.h"

8 #include "media/mojo/interfaces/audio_decoder.mojom.h"	8 #include "media/mojo/interfaces/audio_decoder.mojom.h"

9 #include "media/mojo/services/mojo_audio_decoder.h"	9 #include "media/mojo/services/mojo_audio_decoder.h"

10 #include "media/mojo/services/mojo_video_decoder.h"	10 #include "media/mojo/services/mojo_video_decoder.h"

(...skipping 17 matching lines...) Expand all Loading...
28 shell::GetInterface<interfaces::AudioDecoder>(interface_provider_,	28 shell::GetInterface<interfaces::AudioDecoder>(interface_provider_,

29 &audio_decoder_ptr);	29 &audio_decoder_ptr);

30	30

31 audio_decoders->push_back(	31 audio_decoders->push_back(

32 new media::MojoAudioDecoder(task_runner, std::move(audio_decoder_ptr)));	32 new media::MojoAudioDecoder(task_runner, std::move(audio_decoder_ptr)));

33 #endif	33 #endif

34 }	34 }

35	35

36 void MojoDecoderFactory::CreateVideoDecoders(	36 void MojoDecoderFactory::CreateVideoDecoders(

37 scoped_refptr<base::SingleThreadTaskRunner> task_runner,	37 scoped_refptr<base::SingleThreadTaskRunner> task_runner,

	38 GpuVideoAcceleratorFactories* gpu_factories,

38 ScopedVector<VideoDecoder>* video_decoders) {	39 ScopedVector<VideoDecoder>* video_decoders) {

39 #if defined(ENABLE_MOJO_VIDEO_DECODER)	40 #if defined(ENABLE_MOJO_VIDEO_DECODER)

40 // TODO(sandersd): Connect to mojo video decoder service and pass it here.	41 interfaces::VideoDecoderPtr remote_decoder;

41 video_decoders->push_back(new media::MojoVideoDecoder());	42 shell::GetInterface<interfaces::VideoDecoder>(interface_provider_,

	43 &remote_decoder);

	44 video_decoders->push_back(new media::MojoVideoDecoder(
	xhwang 2016/05/05 17:26:37 nit: here and above, no need for media:: nit: here and above, no need for media:: sandersd (OOO until July 31) 2016/05/06 01:23:55 Done. Show quoted text On 2016/05/05 17:26:37, xhwang wrote: > nit: here and above, no need for media:: Done.
	45 task_runner, gpu_factories, std::move(remote_decoder)));

42 #endif	46 #endif

43 }	47 }

44	48

45 } // namespace media	49 } // namespace media

OLD	NEW