Diff
Modified: trunk/Source/WebCore/ChangeLog (279122 => 279123)
--- trunk/Source/WebCore/ChangeLog 2021-06-22 17:00:38 UTC (rev 279122)
+++ trunk/Source/WebCore/ChangeLog 2021-06-22 17:30:16 UTC (rev 279123)
@@ -1,3 +1,18 @@
+2021-06-22 Jean-Yves Avenard <j...@apple.com>
+
+ Remove unused method in AudioFileReader
+ https://bugs.webkit.org/show_bug.cgi?id=227208
+
+ Reviewed by Chris Dumez.
+
+ Remove two unused methods in AudioFileReader and their related constructors.
+
+ * platform/audio/AudioFileReader.h:
+ * platform/audio/cocoa/AudioFileReaderCocoa.cpp:
+ * platform/audio/cocoa/AudioFileReaderCocoa.h:
+ * platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
+ (WebCore::AudioFileReader::decodeAudioForBusCreation):
+
2021-06-22 Jer Noble <jer.no...@apple.com>
[Cocoa] iOS device steals BT headphones from other devices during silent playback
Modified: trunk/Source/WebCore/platform/audio/AudioFileReader.h (279122 => 279123)
--- trunk/Source/WebCore/platform/audio/AudioFileReader.h 2021-06-22 17:00:38 UTC (rev 279122)
+++ trunk/Source/WebCore/platform/audio/AudioFileReader.h 2021-06-22 17:30:16 UTC (rev 279123)
@@ -26,8 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef AudioFileReader_h
-#define AudioFileReader_h
+#pragma once
#include <stdlib.h>
#include <wtf/RefPtr.h>
@@ -36,7 +35,6 @@
class AudioBus;
-// For both create functions:
// Pass in 0.0 for sampleRate to use the file's sample-rate, otherwise a sample-rate conversion to the requested
// sampleRate will be made (if it doesn't already match the file's sample-rate).
// The created buffer will have its sample-rate set correctly to the result.
@@ -43,11 +41,4 @@
RefPtr<AudioBus> createBusFromInMemoryAudioFile(const void* data, size_t dataSize, bool mixToMono, float sampleRate);
-RefPtr<AudioBus> createBusFromAudioFile(const char* filePath, bool mixToMono, float sampleRate);
-
-// May pass in 0.0 for sampleRate in which case it will use the AudioBus's sampleRate
-void writeBusToAudioFile(AudioBus* bus, const char* filePath, double fileSampleRate);
-
} // namespace WebCore
-
-#endif // AudioFileReader_h
Modified: trunk/Source/WebCore/platform/audio/cocoa/AudioFileReaderCocoa.cpp (279122 => 279123)
--- trunk/Source/WebCore/platform/audio/cocoa/AudioFileReaderCocoa.cpp 2021-06-22 17:00:38 UTC (rev 279122)
+++ trunk/Source/WebCore/platform/audio/cocoa/AudioFileReaderCocoa.cpp 2021-06-22 17:30:16 UTC (rev 279123)
@@ -99,15 +99,6 @@
return true;
}
-AudioFileReader::AudioFileReader(const char* filePath)
-{
- auto filePathString = adoptCF(CFStringCreateWithCString(kCFAllocatorDefault, filePath, kCFStringEncodingUTF8));
- auto urlRef = adoptCF(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, filePathString.get(), kCFURLPOSIXPathStyle, false));
- if (!urlRef)
- return;
- ExtAudioFileOpenURL(urlRef.get(), &m_extAudioFileRef);
-}
-
AudioFileReader::AudioFileReader(const void* data, size_t dataSize)
: m_data(data)
, m_dataSize(dataSize)
@@ -270,12 +261,6 @@
return audioBus;
}
-RefPtr<AudioBus> createBusFromAudioFile(const char* filePath, bool mixToMono, float sampleRate)
-{
- AudioFileReader reader(filePath);
- return reader.createBus(sampleRate, mixToMono);
-}
-
RefPtr<AudioBus> createBusFromInMemoryAudioFile(const void* data, size_t dataSize, bool mixToMono, float sampleRate)
{
AudioFileReader reader(data, dataSize);
Modified: trunk/Source/WebCore/platform/audio/cocoa/AudioFileReaderCocoa.h (279122 => 279123)
--- trunk/Source/WebCore/platform/audio/cocoa/AudioFileReaderCocoa.h 2021-06-22 17:00:38 UTC (rev 279122)
+++ trunk/Source/WebCore/platform/audio/cocoa/AudioFileReaderCocoa.h 2021-06-22 17:30:16 UTC (rev 279123)
@@ -43,7 +43,6 @@
class AudioFileReader {
public:
- explicit AudioFileReader(const char* filePath);
explicit AudioFileReader(const void* data, size_t dataSize);
~AudioFileReader();
Modified: trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp (279122 => 279123)
--- trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2021-06-22 17:00:38 UTC (rev 279122)
+++ trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2021-06-22 17:30:16 UTC (rev 279123)
@@ -54,7 +54,6 @@
WTF_MAKE_FAST_ALLOCATED;
WTF_MAKE_NONCOPYABLE(AudioFileReader);
public:
- AudioFileReader(const char* filePath);
AudioFileReader(const void* data, size_t dataSize);
~AudioFileReader();
@@ -75,7 +74,6 @@
RunLoop& m_runLoop;
const void* m_data { nullptr };
size_t m_dataSize { 0 };
- const char* m_filePath { nullptr };
float m_sampleRate { 0 };
int m_channels { 0 };
HashMap<int, GRefPtr<GstBufferList>> m_buffers;
@@ -114,12 +112,6 @@
reader->plugDeinterleave(pad);
}
-AudioFileReader::AudioFileReader(const char* filePath)
- : m_runLoop(RunLoop::current())
- , m_filePath(filePath)
-{
-}
-
AudioFileReader::AudioFileReader(const void* data, size_t dataSize)
: m_runLoop(RunLoop::current())
, m_data(data)
@@ -361,9 +353,6 @@
source = makeGStreamerElement("giostreamsrc", nullptr);
GRefPtr<GInputStream> memoryStream = adoptGRef(g_memory_input_stream_new_from_data(m_data, m_dataSize, nullptr));
g_object_set(source, "stream", memoryStream.get(), nullptr);
- } else {
- source = gst_element_factory_make("filesrc", nullptr);
- g_object_set(source, "location", m_filePath, nullptr);
}
m_decodebin = makeGStreamerElement("decodebin", "decodebin");
@@ -413,18 +402,6 @@
return audioBus;
}
-RefPtr<AudioBus> createBusFromAudioFile(const char* filePath, bool mixToMono, float sampleRate)
-{
- initializeDebugCategory();
- GST_DEBUG("Creating bus from file %s", filePath);
- RefPtr<AudioBus> bus;
- auto thread = Thread::create("AudioFileReader", [&bus, filePath, mixToMono, sampleRate] {
- bus = AudioFileReader(filePath).createBus(sampleRate, mixToMono);
- });
- thread->waitForCompletion();
- return bus;
-}
-
RefPtr<AudioBus> createBusFromInMemoryAudioFile(const void* data, size_t dataSize, bool mixToMono, float sampleRate)
{
initializeDebugCategory();
