diff --git a/AudioStreaming/Streaming/Audio Source/Mp4/Mp4Restructure.swift b/AudioStreaming/Streaming/Audio Source/Mp4/Mp4Restructure.swift index 0b7df80..18593f1 100644 --- a/AudioStreaming/Streaming/Audio Source/Mp4/Mp4Restructure.swift +++ b/AudioStreaming/Streaming/Audio Source/Mp4/Mp4Restructure.swift @@ -211,10 +211,17 @@ final class Mp4Restructure { foundMoov = true case Atoms.mdat: foundMdat = true + // The header gives the mdat size, so the moov offset is known without + // receiving the whole mdat (usually almost the whole file) + if ftyp != nil, !foundMoov { + atoms.append(MP4Atom(type: atomType, size: atomSize, offset: atomOffset)) + Logger.debug("🕵️ detected a non-optimized mp4 (header-only observation)", category: .generic) + return .needsRestructure(moovOffset: atomOffset + atomSize) + } default: break } - + if ftyp != nil { if foundMoov && !foundMdat { Logger.debug("🕵️ detected an optimized mp4 (header-only observation)", category: .generic) diff --git a/AudioStreamingTests/Streaming/Mp4 Restructure/Mp4RestructureTests.swift b/AudioStreamingTests/Streaming/Mp4 Restructure/Mp4RestructureTests.swift new file mode 100644 index 0000000..da9258b --- /dev/null +++ b/AudioStreamingTests/Streaming/Mp4 Restructure/Mp4RestructureTests.swift @@ -0,0 +1,106 @@ +// +// Mp4RestructureTests.swift +// AudioStreamingTests +// + +import AVFoundation +import XCTest +@testable import AudioStreaming + +class Mp4RestructureTests: XCTestCase { + // moov-at-start.m4a: 1 s AAC from afconvert, ftyp (0, 28), moov (28, 974), free (1002, 3086), mdat (4088, 3960) + // moov-at-end.m4a: the same file with the moov moved behind the mdat and the chunk offsets adjusted, + // ftyp (0, 28), free (28, 3086), mdat (3114, 3960), moov (7074, 974) + private let mdatOffset = 3114 + private let moovOffset = 7074 + + private func fixtureData(_ name: String) throws -> Data { + let url = try XCTUnwrap(Bundle.module.url(forResource: name, withExtension: "m4a")) + return try Data(contentsOf: url) + } + + func test_Non_Optimized_Mp4_Is_Detected_From_The_Mdat_Header() throws { + let data = try fixtureData("moov-at-end") + let restructure = Mp4Restructure() + + // Only the start of the mdat atom has been received, as with a stream that just started + let result = try restructure.checkIsOptimized(data: data[0 ..< mdatOffset + 100]) + + XCTAssertEqual(result, .needsRestructure(moovOffset: moovOffset)) + } + + func test_Non_Optimized_Mp4_Waits_For_The_Mdat_Header() throws { + let data = try fixtureData("moov-at-end") + let restructure = Mp4Restructure() + + XCTAssertEqual(try restructure.checkIsOptimized(data: data[0 ..< mdatOffset + 4]), .undetermined) + XCTAssertEqual( + try restructure.checkIsOptimized(data: data[0 ..< mdatOffset + 8]), + .needsRestructure(moovOffset: moovOffset) + ) + } + + func test_Optimized_Mp4_Is_Detected_From_The_Moov_Header() throws { + let data = try fixtureData("moov-at-start") + let restructure = Mp4Restructure() + + XCTAssertEqual(try restructure.checkIsOptimized(data: data[0 ..< 100]), .optimized) + } + + func test_Restructured_Mp4_Detected_Early_Is_Parsed_Without_Error() throws { + let data = try fixtureData("moov-at-end") + let restructure = Mp4Restructure() + XCTAssertEqual( + try restructure.checkIsOptimized(data: data[0 ..< mdatOffset + 100]), + .needsRestructure(moovOffset: moovOffset) + ) + + // RemoteMp4Restructure fetches the moov from its offset and streams again from mdatOffset + let (initialData, streamOffset) = try restructure.restructureMoov(data: Data(data[moovOffset...])) + let restructured = initialData + data[streamOffset ..< moovOffset] + + let outputFormat = AVAudioFormat(commonFormat: .pcmFormatFloat32, sampleRate: 44100, channels: 2, interleaved: true)! + let playerContext = AudioPlayerContext() + let rendererContext = AudioRendererContext(configuration: .default, outputAudioFormat: outputFormat) + defer { rendererContext.clean() } + let processor = AudioFileStreamProcessor(playerContext: playerContext, + rendererContext: rendererContext, + outputAudioFormat: outputFormat.basicStreamDescription) + var raisedErrors: [AudioPlayerError] = [] + processor.fileStreamCallback = { effect in + if case let .raiseError(error) = effect { raisedErrors.append(error) } + } + let entry = AudioEntry(source: RestructureTestSource(length: restructured.count), + entryId: AudioEntryId(id: "entry"), + outputAudioFormat: outputFormat) + playerContext.audioReadingEntry = entry + + XCTAssertEqual(processor.openFileStream(with: kAudioFileM4AType), noErr) + defer { processor.closeFileStreamIfNeeded() } + var offset = 0 + while offset < restructured.count { + let chunk = restructured[offset ..< min(offset + 1024, restructured.count)] + XCTAssertEqual(processor.parseFileStreamBytes(data: chunk), noErr, "chunk at \(offset)") + offset += chunk.count + } + XCTAssertEqual(processor.flushRemainingPackets(), noErr) + + XCTAssertTrue(raisedErrors.isEmpty) + XCTAssertEqual(entry.audioStreamState.dataByteCount, 3952) + } +} + +private final class RestructureTestSource: CoreAudioStreamSource { + let position = 0 + let length: Int + weak var delegate: AudioStreamSourceDelegate? + let audioFileHint: AudioFileTypeID = kAudioFileM4AType + let underlyingQueue = DispatchQueue(label: "mp4-restructure-tests") + + init(length: Int) { self.length = length } + + func close() {} + func suspend() {} + func resume() {} + func seek(at _: Int) {} +} diff --git a/AudioStreamingTests/Streaming/Mp4 Restructure/moov-at-end.m4a b/AudioStreamingTests/Streaming/Mp4 Restructure/moov-at-end.m4a new file mode 100644 index 0000000..9baf565 Binary files /dev/null and b/AudioStreamingTests/Streaming/Mp4 Restructure/moov-at-end.m4a differ diff --git a/AudioStreamingTests/Streaming/Mp4 Restructure/moov-at-start.m4a b/AudioStreamingTests/Streaming/Mp4 Restructure/moov-at-start.m4a new file mode 100644 index 0000000..4ea6065 Binary files /dev/null and b/AudioStreamingTests/Streaming/Mp4 Restructure/moov-at-start.m4a differ diff --git a/Package.swift b/Package.swift index 5249157..6fddc13 100644 --- a/Package.swift +++ b/Package.swift @@ -60,7 +60,9 @@ let package = Package( exclude: ["Info.plist", "Streaming/output"], resources: [ // Test resources for metadata stream processor tests - .copy("Streaming/Metadata Stream Processor/raw-audio-streams") + .copy("Streaming/Metadata Stream Processor/raw-audio-streams"), + .copy("Streaming/Mp4 Restructure/moov-at-end.m4a"), + .copy("Streaming/Mp4 Restructure/moov-at-start.m4a") ] ) ]