content/renderer/media/audio_decoder.cc - Issue 1415793003: fix build when ffmpeg, libvpx and libwebm are disabled

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

Unified Diff: content/renderer/media/audio_decoder.cc

Issue 1415793003: fix build when ffmpeg, libvpx and libwebm are disabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« chrome/utility/extensions/extensions_handler.cc ('K') | « chrome/utility/media_galleries/media_metadata_parser.cc ('k') | content/renderer/media/media_recorder_handler.cc » ('j') | content/renderer/media/media_recorder_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/audio_decoder.cc

diff --git a/content/renderer/media/audio_decoder.cc b/content/renderer/media/audio_decoder.cc

index c413bb08020ae0fc9ff3f940fabc306dfe77bc79..805ff036dd9bf6f2f2674da65d4654ea8bf0633f 100644

--- a/content/renderer/media/audio_decoder.cc

+++ b/content/renderer/media/audio_decoder.cc

@@ -31,6 +31,7 @@ bool DecodeAudioFileData(

if (!destination_bus)

return false;

+#if !defined(MEDIA_DISABLE_FFMPEG)

// Uses the FFmpeg library for audio file reading.

InMemoryUrlProtocol url_protocol(reinterpret_cast<const uint8*>(data),

data_size, false);

@@ -89,6 +90,9 @@ bool DecodeAudioFileData(

<< " number of channels: " << number_of_channels;

return actual_frames > 0;

+#else

+ return false;

+#endif

xhwang 2015/11/02 18:11:51 #endif // !defined(MEDIA_DISABLE_FFMPEG)

Julien Isorce Samsung 2015/11/03 16:02:27 Acknowledged.

}

} // namespace content