diff --git a/package/android/src/main/java/com/mrousavy/camera/core/ChunkedRecorder.kt b/package/android/src/main/java/com/mrousavy/camera/core/ChunkedRecorder.kt
new file mode 100644
index 0000000..a71d296
--- /dev/null
+++ b/package/android/src/main/java/com/mrousavy/camera/core/ChunkedRecorder.kt
@@ -0,0 +1,220 @@
+package com.mrousavy.camera.core
+
+import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.Channel
+import android.media.MediaCodec
+import android.media.MediaCodecInfo
+import android.media.MediaFormat
+import android.media.MediaMuxer
+import android.util.Log
+import android.util.Size
+import android.view.Surface
+import java.io.File
+import com.mrousavy.camera.types.Orientation
+import com.mrousavy.camera.types.RecordVideoOptions
+import java.nio.ByteBuffer
+
+class ChunkedRecordingManager(
+  private val encoder: MediaCodec,
+  private val outputDirectory: File,
+  private val orientationHint: Int,
+) {
+  companion object {
+    private const val TAG = "ChunkedRecorder"
+    private const val targetDurationUs = 10 * 1000000
+
+    fun fromParams(
+      size: Size,
+      enableAudio: Boolean,
+      fps: Int? = null,
+      orientation: Orientation,
+      options: RecordVideoOptions,
+      outputDirectory: File,
+    ): ChunkedRecordingManager {
+
+      val mimeType = options.videoCodec.toMimeType()
+      val format = MediaFormat.createVideoFormat(mimeType, size.width, size.height)
+
+      val codec = MediaCodec.createEncoderByType(mimeType)
+
+      // Set some properties. Failing to specify some of these can cause the MediaCodec
+      // configure() call to throw an unhelpful exception.
+      format.setInteger(
+          MediaFormat.KEY_COLOR_FORMAT,
+          MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface
+      )
+      fps?.apply {
+        format.setInteger(MediaFormat.KEY_FRAME_RATE, this)
+      }
+      // TODO: Pull this out into configuration
+      format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, 1)
+
+
+      Log.d(TAG, "Video Format: $format")
+      // Create a MediaCodec encoder, and configure it with our format.  Get a Surface
+      // we can use for input and wrap it with a class that handles the EGL work.
+      codec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE)
+      return ChunkedRecordingManager(codec, outputDirectory, orientation.toDegrees())
+    }
+  }
+
+  // In flight details
+  private val bufferInfo = MediaCodec.BufferInfo()
+  private var currentFrameNumber: Int = 0
+  private var chunkIndex = 0
+  private var encodedFormat: MediaFormat? = null
+
+  val surface: Surface = encoder.createInputSurface()
+
+  init {
+    if (!this.outputDirectory.exists()) {
+      this.outputDirectory.mkdirs()
+    }
+  }
+
+  // Muxer specific
+  private class MuxerContext(
+    muxer: MediaMuxer,
+    startTimeUs: Long,
+    encodedFormat: MediaFormat
+  ) {
+    val muxer = muxer
+    val videoTrack: Int = muxer.addTrack(encodedFormat)
+    val startTimeUs: Long = startTimeUs
+
+    init {
+      muxer.start()
+    }
+
+    fun finish() {
+      muxer.stop()
+      muxer.release()
+    }
+  }
+
+  private lateinit var muxerContext: MuxerContext
+
+  private fun createNextMuxer() {
+    if (::muxerContext.isInitialized) {
+      muxerContext.finish()
+      chunkIndex++
+    }
+
+    val newFileName = "$chunkIndex.mp4"
+    val newOutputFile = File(this.outputDirectory, newFileName)
+    Log.d(TAG, "Creating new muxer for file: $newFileName")
+    val muxer = MediaMuxer(
+      newOutputFile.absolutePath, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4
+    )
+    muxerContext = MuxerContext(
+      muxer, bufferInfo.presentationTimeUs, this.encodedFormat!!
+    )
+    muxer.setOrientationHint(orientationHint)
+  }
+
+  private fun atKeyframe(): Boolean {
+    return (bufferInfo.flags and MediaCodec.BUFFER_FLAG_KEY_FRAME) != 0
+  }
+
+  private fun chunkLengthUs(): Long {
+    return bufferInfo.presentationTimeUs - muxerContext.startTimeUs
+  }
+
+  fun drainEncoder(): Boolean {
+    val timeout: Long = 0
+    var frameWasEncoded = false
+
+    while (true) {
+      var encoderStatus: Int = encoder.dequeueOutputBuffer(bufferInfo, timeout)
+
+      if (encoderStatus < 0) {
+        Log.w(
+          TAG, "Unexpected result from encoder.dequeueOutputBuffer: $encoderStatus"
+        )
+      }
+
+      when (encoderStatus) {
+        MediaCodec.INFO_TRY_AGAIN_LATER -> break;
+        MediaCodec.INFO_OUTPUT_FORMAT_CHANGED -> {
+          // Should happen before receiving buffers, and should only happen once. The MediaFormat
+          // contains the csd-0 and csd-1 keys, which we'll need for MediaMuxer. It's unclear what
+          // else MediaMuxer might want, so rather than extract the codec-specific data and
+          // reconstruct a new MediaFormat later, we just grab it here and keep it around.
+          encodedFormat = encoder.outputFormat
+          Log.d(TAG, "encoder output format changed: $encodedFormat")
+        }
+        else -> {
+          var encodedData: ByteBuffer = encoder.getOutputBuffer(encoderStatus)
+              ?: throw RuntimeException("encoderOutputBuffer $encoderStatus was null")
+
+          if ((bufferInfo.flags and MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
+            // The codec config data was pulled out when we got the
+            // INFO_OUTPUT_FORMAT_CHANGED status.  The MediaMuxer won't accept
+            // a single big blob -- it wants separate csd-0/csd-1 chunks --
+            // so simply saving this off won't work.
+            Log.d(TAG, "ignoring BUFFER_FLAG_CODEC_CONFIG")
+              bufferInfo.size = 0
+          }
+
+          if (bufferInfo.size != 0) {
+            // adjust the ByteBuffer values to match BufferInfo (not needed?)
+            encodedData.position(bufferInfo.offset)
+            encodedData.limit(bufferInfo.offset + bufferInfo.size)
+
+            if (!::muxerContext.isInitialized || (atKeyframe() && chunkLengthUs() >= targetDurationUs)) {
+              this.createNextMuxer()
+            }
+
+            // TODO: we should probably add the presentation time stamp
+            // mEncBuffer.add(encodedData, bufferInfo.flags, bufferInfo.presentationTimeUs)
+
+            muxerContext.muxer.writeSampleData(muxerContext.videoTrack, encodedData, bufferInfo)
+            frameWasEncoded = true
+          }
+
+          encoder.releaseOutputBuffer(encoderStatus, false)
+
+          if ((bufferInfo.flags and MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+            Log.w(TAG, "reached end of stream unexpectedly")
+            break
+          }
+        }
+      }
+    }
+    return frameWasEncoded
+  }
+
+  fun finish() {
+    if (::muxerContext.isInitialized) {
+      muxerContext.finish()
+    }
+  }
+}
+
+class ChunkedRecorder(private val manager: ChunkedRecordingManager) {
+    private val messageChannel = Channel<Message>()
+
+    init {
+        CoroutineScope(Dispatchers.Default).launch {
+            for (msg in messageChannel) {
+                when (msg) {
+                    is Message.FrameAvailable -> manager.drainEncoder()
+                    is Message.Shutdown -> manager.finish()
+                }
+            }
+        }
+    }
+
+    fun sendFrameAvailable() {
+        messageChannel.trySend(Message.FrameAvailable)
+    }
+
+    fun sendShutdown() {
+        messageChannel.trySend(Message.Shutdown)
+    }
+
+    sealed class Message {
+        object FrameAvailable : Message()
+        object Shutdown : Message()
+    }
+}
diff --git a/package/android/src/main/java/com/mrousavy/camera/core/RecordingSession.kt b/package/android/src/main/java/com/mrousavy/camera/core/RecordingSession.kt
index 78e2f14..de9ed7f 100644
--- a/package/android/src/main/java/com/mrousavy/camera/core/RecordingSession.kt
+++ b/package/android/src/main/java/com/mrousavy/camera/core/RecordingSession.kt
@@ -1,9 +1,6 @@
 package com.mrousavy.camera.core
 
 import android.content.Context
-import android.media.MediaCodec
-import android.media.MediaRecorder
-import android.os.Build
 import android.util.Log
 import android.util.Size
 import android.view.Surface
@@ -36,68 +33,22 @@ class RecordingSession(
 
   data class Video(val path: String, val durationMs: Long, val size: Size)
 
+  private val outputPath = File.createTempFile("mrousavy", options.fileType.toExtension(), context.cacheDir)
+
   private val bitRate = getBitRate()
-  private val recorder: MediaRecorder
-  private val outputFile: File
+  private val recordingManager = ChunkedRecordingManager.fromParams(
+    size, enableAudio, fps, orientation, options, outputPath
+  )
+  private val recorder: ChunkedRecorder = ChunkedRecorder(recordingManager)
   private var startTime: Long? = null
-  val surface: Surface = MediaCodec.createPersistentInputSurface()
-
-  // TODO: Implement HDR
-  init {
-    outputFile = FileUtils.createTempFile(context, options.fileType.toExtension())
-
-    Log.i(TAG, "Creating RecordingSession for ${outputFile.absolutePath}")
-
-    recorder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) MediaRecorder(context) else MediaRecorder()
-
-    if (enableAudio) recorder.setAudioSource(MediaRecorder.AudioSource.CAMCORDER)
-    recorder.setVideoSource(MediaRecorder.VideoSource.SURFACE)
-
-    recorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4)
-
-    recorder.setOutputFile(outputFile.absolutePath)
-    recorder.setVideoEncodingBitRate(bitRate)
-    recorder.setVideoSize(size.height, size.width)
-    recorder.setMaxFileSize(getMaxFileSize())
-    if (fps != null) recorder.setVideoFrameRate(fps)
-
-    Log.i(TAG, "Using ${options.videoCodec} Video Codec at ${bitRate / 1_000_000.0} Mbps..")
-    recorder.setVideoEncoder(options.videoCodec.toVideoEncoder())
-    if (enableAudio) {
-      Log.i(TAG, "Adding Audio Channel..")
-      recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC)
-      recorder.setAudioEncodingBitRate(AUDIO_BIT_RATE)
-      recorder.setAudioSamplingRate(AUDIO_SAMPLING_RATE)
-      recorder.setAudioChannels(AUDIO_CHANNELS)
+  val surface: Surface
+    get() {
+      return recordingManager.surface
     }
-    recorder.setInputSurface(surface)
-    // recorder.setOrientationHint(orientation.toDegrees())
-
-    recorder.setOnErrorListener { _, what, extra ->
-      Log.e(TAG, "MediaRecorder Error: $what ($extra)")
-      stop()
-      val name = when (what) {
-        MediaRecorder.MEDIA_RECORDER_ERROR_UNKNOWN -> "unknown"
-        MediaRecorder.MEDIA_ERROR_SERVER_DIED -> "server-died"
-        else -> "unknown"
-      }
-      onError(RecorderError(name, extra))
-    }
-    recorder.setOnInfoListener { _, what, extra ->
-      Log.i(TAG, "MediaRecorder Info: $what ($extra)")
-      if (what == MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED) {
-        onError(InsufficientStorageError())
-      }
-    }
-
-    Log.i(TAG, "Created $this!")
-  }
 
   fun start() {
     synchronized(this) {
       Log.i(TAG, "Starting RecordingSession..")
-      recorder.prepare()
-      recorder.start()
       startTime = System.currentTimeMillis()
     }
   }
@@ -106,29 +57,28 @@ class RecordingSession(
     synchronized(this) {
       Log.i(TAG, "Stopping RecordingSession..")
       try {
-        recorder.stop()
-        recorder.release()
+        recorder.sendShutdown()
       } catch (e: Error) {
         Log.e(TAG, "Failed to stop MediaRecorder!", e)
       }
 
       val stopTime = System.currentTimeMillis()
       val durationMs = stopTime - (startTime ?: stopTime)
-      callback(Video(outputFile.absolutePath, durationMs, size))
+      //callback(Video(outputFile.absolutePath, durationMs, size))
     }
   }
 
   fun pause() {
     synchronized(this) {
       Log.i(TAG, "Pausing Recording Session..")
-      recorder.pause()
+      // TODO: Implement pausing
     }
   }
 
   fun resume() {
     synchronized(this) {
       Log.i(TAG, "Resuming Recording Session..")
-      recorder.resume()
+      // TODO: Implement pausing
     }
   }
 
@@ -161,4 +111,8 @@ class RecordingSession(
     return "${size.width} x ${size.height} @ $fps FPS ${options.videoCodec} ${options.fileType} " +
       "$orientation ${bitRate / 1_000_000.0} Mbps RecordingSession ($audio)"
   }
+
+  fun onFrame() {
+    recorder.sendFrameAvailable()
+  }
 }
diff --git a/package/android/src/main/java/com/mrousavy/camera/core/VideoPipeline.kt b/package/android/src/main/java/com/mrousavy/camera/core/VideoPipeline.kt
index f6df554..4d725d4 100644
--- a/package/android/src/main/java/com/mrousavy/camera/core/VideoPipeline.kt
+++ b/package/android/src/main/java/com/mrousavy/camera/core/VideoPipeline.kt
@@ -152,6 +152,8 @@ class VideoPipeline(
 
       // 5. Draw it with applied rotation/mirroring
       onFrame(transformMatrix)
+
+      recording?.onFrame()
     }
   }
 
diff --git a/package/android/src/main/java/com/mrousavy/camera/types/VideoCodec.kt b/package/android/src/main/java/com/mrousavy/camera/types/VideoCodec.kt
index 251a27f..ae5cc35 100644
--- a/package/android/src/main/java/com/mrousavy/camera/types/VideoCodec.kt
+++ b/package/android/src/main/java/com/mrousavy/camera/types/VideoCodec.kt
@@ -1,6 +1,7 @@
 package com.mrousavy.camera.types
 
 import android.media.MediaRecorder
+import android.media.MediaFormat
 
 enum class VideoCodec(override val unionValue: String) : JSUnionValue {
   H264("h264"),
@@ -12,6 +13,12 @@ enum class VideoCodec(override val unionValue: String) : JSUnionValue {
       H265 -> MediaRecorder.VideoEncoder.HEVC
     }
 
+  fun toMimeType(): String =
+    when (this) {
+      H264 -> MediaFormat.MIMETYPE_VIDEO_AVC
+      H265 -> MediaFormat.MIMETYPE_VIDEO_HEVC
+    }
+
   companion object : JSUnionValue.Companion<VideoCodec> {
     override fun fromUnionValue(unionValue: String?): VideoCodec =
       when (unionValue) {