X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=5fd5d1f7b452f2cda88a56cc6cccc2df62fe00df;hb=c3003b00fa5281e2905a9e2f204d7b31893d01fc;hp=1d1a60cdea8f96576d202730bfdf763f7deb0712;hpb=09680dae8c4a9bc49253517badb16e6fc7f060ed;p=nageru diff --git a/mixer.cpp b/mixer.cpp index 1d1a60c..5fd5d1f 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -1,5 +1,3 @@ -#define EXTRAHEIGHT 30 - #undef Success #include "mixer.h" @@ -107,7 +105,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) CaptureCard *card = &cards[card_index]; card->usb = new BMUSBCapture(card_index); card->usb->set_frame_callback(bind(&Mixer::bm_frame, this, card_index, _1, _2, _3, _4, _5, _6, _7)); - card->frame_allocator.reset(new PBOFrameAllocator(WIDTH * (HEIGHT+EXTRAHEIGHT) * 2 + 44 + 1, WIDTH, HEIGHT)); + card->frame_allocator.reset(new PBOFrameAllocator(8 << 20, WIDTH, HEIGHT)); // 8 MB. card->usb->set_video_frame_allocator(card->frame_allocator.get()); card->surface = create_surface(format); card->usb->set_dequeue_thread_callbacks( @@ -220,10 +218,11 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, { CaptureCard *card = &cards[card_index]; - int width, height, frame_rate_nom, frame_rate_den; + int width, height, frame_rate_nom, frame_rate_den, extra_lines_top, extra_lines_bottom; bool interlaced; - decode_video_format(video_format, &width, &height, &frame_rate_nom, &frame_rate_den, &interlaced); // Ignore return value for now. + decode_video_format(video_format, &width, &height, &extra_lines_top, &extra_lines_bottom, + &frame_rate_nom, &frame_rate_den, &interlaced); // Ignore return value for now. int64_t frame_length = TIMEBASE * frame_rate_den / frame_rate_nom; size_t num_samples = (audio_frame.len >= audio_offset) ? (audio_frame.len - audio_offset) / 8 / 3 : 0; @@ -245,7 +244,6 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, if (card->last_timecode != -1) { dropped_frames = unwrap_timecode(timecode, card->last_timecode) - card->last_timecode - 1; } - card->last_timecode = timecode; // Convert the audio to stereo fp32 and add it. vector audio; @@ -256,29 +254,39 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, { unique_lock lock(card->audio_mutex); + // Number of samples per frame if we need to insert silence. + // (Could be nonintegral, but resampling will save us then.) + int silence_samples = OUTPUT_FREQUENCY * frame_rate_den / frame_rate_nom; + if (dropped_frames > MAX_FPS * 2) { - fprintf(stderr, "Card %d lost more than two seconds (or time code jumping around), resetting resampler\n", - card_index); + fprintf(stderr, "Card %d lost more than two seconds (or time code jumping around; from 0x%04x to 0x%04x), resetting resampler\n", + card_index, card->last_timecode, timecode); card->resampling_queue.reset(new ResamplingQueue(OUTPUT_FREQUENCY, OUTPUT_FREQUENCY, 2)); + dropped_frames = 0; } else if (dropped_frames > 0) { - // Insert silence as needed. (The number of samples could be nonintegral, - // but resampling will save us then.) + // Insert silence as needed. fprintf(stderr, "Card %d dropped %d frame(s) (before timecode 0x%04x), inserting silence.\n", card_index, dropped_frames, timecode); vector silence; - silence.resize((OUTPUT_FREQUENCY * frame_length / TIMEBASE) * 2); + silence.resize(silence_samples * 2); for (int i = 0; i < dropped_frames; ++i) { - card->resampling_queue->add_input_samples(local_pts / double(TIMEBASE), silence.data(), silence.size() / 2); + card->resampling_queue->add_input_samples(local_pts / double(TIMEBASE), silence.data(), silence_samples); // Note that if the format changed in the meantime, we have // no way of detecting that; we just have to assume the frame length // is always the same. local_pts += frame_length; } } + if (num_samples == 0) { + audio.resize(silence_samples * 2); + num_samples = silence_samples; + } card->resampling_queue->add_input_samples(local_pts / double(TIMEBASE), audio.data(), num_samples); card->next_local_pts = local_pts + frame_length; } + card->last_timecode = timecode; + // Done with the audio, so release it. if (audio_frame.owner) { audio_frame.owner->release_frame(audio_frame); @@ -291,7 +299,9 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, if (card->should_quit) return; } - if (video_frame.len - video_offset != WIDTH * (HEIGHT+EXTRAHEIGHT) * 2) { + if (video_frame.len - video_offset == 0 || + video_frame.len - video_offset != size_t(width * (height + extra_lines_top + extra_lines_bottom) * 2) || + width != WIDTH || height != HEIGHT) { // TODO: Remove this once the rest of the infrastructure is in place. if (video_frame.len != 0) { printf("Card %d: Dropping video frame with wrong length (%ld)\n", card_index, video_frame.len - video_offset); @@ -325,13 +335,17 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, //check_error(); // Upload the textures. - glBindTexture(GL_TEXTURE_2D, userdata->tex_y); + size_t cbcr_width = width / 2; + size_t cbcr_offset = video_offset / 2; + size_t y_offset = video_frame.size / 2 + video_offset / 2; + + glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr); check_error(); - glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, WIDTH, HEIGHT, GL_RED, GL_UNSIGNED_BYTE, BUFFER_OFFSET((WIDTH * (HEIGHT+EXTRAHEIGHT) * 2 + 44) / 2 + WIDTH * 25 + 22)); + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, cbcr_width, height, GL_RG, GL_UNSIGNED_BYTE, BUFFER_OFFSET(cbcr_offset + cbcr_width * extra_lines_top * sizeof(uint16_t))); check_error(); - glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr); + glBindTexture(GL_TEXTURE_2D, userdata->tex_y); check_error(); - glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, WIDTH/2, HEIGHT, GL_RG, GL_UNSIGNED_BYTE, BUFFER_OFFSET(WIDTH * 25 + 22)); + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RED, GL_UNSIGNED_BYTE, BUFFER_OFFSET(y_offset + width * extra_lines_top)); check_error(); glBindTexture(GL_TEXTURE_2D, 0); check_error(); @@ -390,6 +404,7 @@ void Mixer::thread_func() int num_samples_times_timebase = OUTPUT_FREQUENCY * card->new_frame_length + card->fractional_samples; num_samples[card_index] = num_samples_times_timebase / TIMEBASE; card->fractional_samples = num_samples_times_timebase % TIMEBASE; + assert(num_samples[card_index] >= 0); } }