- // Unmap the image.
- GLSurface *surf = &gl_surfaces[current_frame_display % SURFACE_NUM];
- eglDestroyImageKHR(eglGetCurrentDisplay(), surf->y_egl_image);
- eglDestroyImageKHR(eglGetCurrentDisplay(), surf->cbcr_egl_image);
- VAStatus va_status = vaReleaseBufferHandle(va_dpy, surf->surface_image.buf);
- CHECK_VASTATUS(va_status, "vaReleaseBufferHandle");
- va_status = vaDestroyImage(va_dpy, surf->surface_image.image_id);
- CHECK_VASTATUS(va_status, "vaDestroyImage");
-
- VASurfaceID surface = surf->src_surface;
-
- // Schedule the frame for encoding.
- va_status = vaBeginPicture(va_dpy, context_id, surface);
- CHECK_VASTATUS(va_status, "vaBeginPicture");
-
- if (current_frame_type == FRAME_IDR) {
- render_sequence();
- render_picture();
- if (h264_packedheader) {
- render_packedsequence();
- render_packedpicture();
- }
- } else {
- //render_sequence();
- render_picture();
+ encode_frame(frame, encoding_frame_num, display_frame_num, gop_start_display_frame_num, frame_type, frame.pts, dts);
+ }
+}
+
+void H264Encoder::encode_remaining_frames_as_p(int encoding_frame_num, int gop_start_display_frame_num, int64_t last_dts)
+{
+ if (pending_video_frames.empty()) {
+ return;
+ }
+
+ for (auto &pending_frame : pending_video_frames) {
+ int display_frame_num = pending_frame.first;
+ assert(display_frame_num > 0);
+ PendingFrame frame = move(pending_frame.second);
+ int64_t dts = last_dts + (TIMEBASE / MAX_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);
+ last_dts = dts;
+ }
+}
+
+void H264Encoder::encode_frame(H264Encoder::PendingFrame frame, int encoding_frame_num, int display_frame_num, int gop_start_display_frame_num,
+ int frame_type, int64_t pts, int64_t dts)
+{
+ // Wait for the GPU to be done with the frame.
+ glClientWaitSync(frame.fence.get(), 0, 0);
+
+ // Release back any input frames we needed to render this frame.
+ frame.input_frames.clear();
+
+ // Unmap the image.
+ GLSurface *surf = &gl_surfaces[display_frame_num % SURFACE_NUM];
+ eglDestroyImageKHR(eglGetCurrentDisplay(), surf->y_egl_image);
+ eglDestroyImageKHR(eglGetCurrentDisplay(), surf->cbcr_egl_image);
+ VAStatus va_status = vaReleaseBufferHandle(va_dpy, surf->surface_image.buf);
+ CHECK_VASTATUS(va_status, "vaReleaseBufferHandle");
+ va_status = vaDestroyImage(va_dpy, surf->surface_image.image_id);
+ CHECK_VASTATUS(va_status, "vaDestroyImage");
+
+ VASurfaceID surface = surf->src_surface;
+
+ // Schedule the frame for encoding.
+ va_status = vaBeginPicture(va_dpy, context_id, surface);
+ CHECK_VASTATUS(va_status, "vaBeginPicture");
+
+ if (frame_type == FRAME_IDR) {
+ render_sequence();
+ render_picture(frame_type, display_frame_num, gop_start_display_frame_num);
+ if (h264_packedheader) {
+ render_packedsequence();
+ render_packedpicture();