X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fquicksync_encoder.cpp;h=9c6e40ceb515baf146fa8743bdf74511d1f213ad;hb=c364ccde52c21ef2edf19e93379b7e77dffa7cd8;hp=328c2c62653862c4f1a29bb0f3a7d57a62ad2700;hpb=ba3ea588faa8e7908bce832820c08e43a09863fe;p=nageru diff --git a/nageru/quicksync_encoder.cpp b/nageru/quicksync_encoder.cpp index 328c2c6..9c6e40c 100644 --- a/nageru/quicksync_encoder.cpp +++ b/nageru/quicksync_encoder.cpp @@ -1352,7 +1352,10 @@ void QuickSyncEncoderImpl::save_codeddata(GLSurface *surf, storage_task task) } if (!global_flags.x264_video_to_http && !global_flags.av1_video_to_http) { - stream_mux->add_packet(pkt, task.pts + global_delay(), task.dts + global_delay()); + http_mux->add_packet(pkt, task.pts + global_delay(), task.dts + global_delay()); + if (srt_mux != nullptr) { + srt_mux->add_packet(pkt, task.pts + global_delay(), task.dts + global_delay()); + } } } } @@ -1856,7 +1859,6 @@ void QuickSyncEncoderImpl::encode_remaining_frames_as_p(int encoding_frame_num, assert(display_frame_num > 0); PendingFrame frame = move(pending_frame.second); int64_t dts = last_dts + (TIMEBASE / TYPICAL_FPS); - printf("Finalizing encode: Encoding leftover frame %d as P-frame instead of B-frame.\n", display_frame_num); encode_frame(frame, encoding_frame_num++, display_frame_num, gop_start_display_frame_num, FRAME_P, frame.pts, dts, frame.duration, frame.ycbcr_coefficients); last_dts = dts; } @@ -2045,9 +2047,14 @@ void QuickSyncEncoder::close_file() impl->shutdown(); } -void QuickSyncEncoder::set_stream_mux(Mux *mux) +void QuickSyncEncoder::set_http_mux(Mux *mux) +{ + impl->set_http_mux(mux); +} + +void QuickSyncEncoder::set_srt_mux(Mux *mux) { - impl->set_stream_mux(mux); + impl->set_srt_mux(mux); } int64_t QuickSyncEncoder::global_delay() const {