FrameAllocator::~FrameAllocator() {}
-// Audio is more important than video, and also much cheaper.
-// By having many more audio frames available, hopefully if something
-// starts to drop, we'll have CPU load go down (from not having to
-// process as much video) before we have to drop audio.
-#define NUM_QUEUED_VIDEO_FRAMES 16
-#define NUM_QUEUED_AUDIO_FRAMES 64
-
-class MallocFrameAllocator : public FrameAllocator {
-public:
- MallocFrameAllocator(size_t frame_size, size_t num_queued_frames);
- Frame alloc_frame() override;
- void release_frame(Frame frame) override;
-
-private:
- size_t frame_size;
-
- mutex freelist_mutex;
- stack<unique_ptr<uint8_t[]>> freelist; // All of size <frame_size>.
-};
-
MallocFrameAllocator::MallocFrameAllocator(size_t frame_size, size_t num_queued_frames)
: frame_size(frame_size)
{
uint16_t video_timecode = pending_video_frames.front().timecode;
uint16_t audio_timecode = pending_audio_frames.front().timecode;
+ AudioFormat audio_format;
+ audio_format.bits_per_sample = 24;
+ audio_format.num_channels = 8;
if (uint16_less_than_with_wraparound(video_timecode, audio_timecode)) {
printf("Video block 0x%04x without corresponding audio block, dropping.\n",
video_timecode);
QueuedFrame audio_frame = pending_audio_frames.front();
pending_audio_frames.pop_front();
lock.unlock();
+ audio_format.id = audio_frame.format;
frame_callback(audio_timecode,
FrameAllocator::Frame(), 0, VideoFormat(),
- audio_frame.frame, AUDIO_HEADER_SIZE, audio_frame.format);
+ audio_frame.frame, AUDIO_HEADER_SIZE, audio_format);
} else {
QueuedFrame video_frame = pending_video_frames.front();
QueuedFrame audio_frame = pending_audio_frames.front();
#endif
VideoFormat video_format;
+ audio_format.id = audio_frame.format;
if (decode_video_format(video_frame.format, &video_format)) {
frame_callback(video_timecode,
video_frame.frame, HEADER_SIZE, video_format,
- audio_frame.frame, AUDIO_HEADER_SIZE, audio_frame.format);
+ audio_frame.frame, AUDIO_HEADER_SIZE, audio_format);
} else {
frame_callback(video_timecode,
FrameAllocator::Frame(), 0, video_format,
- audio_frame.frame, AUDIO_HEADER_SIZE, audio_frame.format);
+ audio_frame.frame, AUDIO_HEADER_SIZE, audio_format);
}
}
}