VA_RC_VCM,
VA_RC_NONE,
};
-static unsigned long long current_frame_display = 0;
-static unsigned long long current_IDR_display = 0;
static unsigned int current_frame_num = 0;
static int misc_priv_type = 0;
#define FRAME_I 2
#define FRAME_IDR 7
void encoding2display_order(
- unsigned long long encoding_order, int intra_period,
+ int encoding_order, int intra_period,
int intra_idr_period, int ip_period,
- unsigned long long *displaying_order,
+ int *displaying_order,
int *frame_type, int *pts_lag)
{
int encoding_order_gop = 0;
sort_one(ref, j+1, right, list1_ascending, frame_idx);
}
-static int update_ReferenceFrames(int frame_type)
+static void update_ReferenceFrames(int frame_type)
{
int i;
if (frame_type == FRAME_B)
- return 0;
+ return;
CurrentCurrPic.flags = VA_PICTURE_H264_SHORT_TERM_REFERENCE;
numShortTerm++;
current_frame_num++;
if (current_frame_num > MaxFrameNum)
current_frame_num = 0;
-
- return 0;
}
return TopFieldOrderCnt;
}
-static int render_picture(int frame_type)
+static int render_picture(int frame_type, int display_frame_num, int gop_start_display_frame_num)
{
VABufferID pic_param_buf;
VAStatus va_status;
int i = 0;
- pic_param.CurrPic.picture_id = gl_surfaces[current_frame_display % SURFACE_NUM].ref_surface;
+ pic_param.CurrPic.picture_id = gl_surfaces[display_frame_num % SURFACE_NUM].ref_surface;
pic_param.CurrPic.frame_idx = current_frame_num;
pic_param.CurrPic.flags = 0;
- pic_param.CurrPic.TopFieldOrderCnt = calc_poc((current_frame_display - current_IDR_display) % MaxPicOrderCntLsb, frame_type);
+ pic_param.CurrPic.TopFieldOrderCnt = calc_poc((display_frame_num - gop_start_display_frame_num) % MaxPicOrderCntLsb, frame_type);
pic_param.CurrPic.BottomFieldOrderCnt = pic_param.CurrPic.TopFieldOrderCnt;
CurrentCurrPic = pic_param.CurrPic;
pic_param.pic_fields.bits.entropy_coding_mode_flag = h264_entropy_mode;
pic_param.pic_fields.bits.deblocking_filter_control_present_flag = 1;
pic_param.frame_num = current_frame_num;
- pic_param.coded_buf = gl_surfaces[current_frame_display % SURFACE_NUM].coded_buf;
+ pic_param.coded_buf = gl_surfaces[display_frame_num % SURFACE_NUM].coded_buf;
pic_param.last_picture = false; // FIXME
pic_param.pic_init_qp = initial_qp;
free(packedslice_buffer);
}
-static int render_slice(int encoding_frame_num, int frame_type)
+static int render_slice(int encoding_frame_num, int display_frame_num, int gop_start_display_frame_num, int frame_type)
{
VABufferID slice_param_buf;
VAStatus va_status;
slice_param.slice_alpha_c0_offset_div2 = 0;
slice_param.slice_beta_offset_div2 = 0;
slice_param.direct_spatial_mv_pred_flag = 1;
- slice_param.pic_order_cnt_lsb = (current_frame_display - current_IDR_display) % MaxPicOrderCntLsb;
+ slice_param.pic_order_cnt_lsb = (display_frame_num - gop_start_display_frame_num) % MaxPicOrderCntLsb;
if (h264_packedheader &&
vector<float> audio;
{
unique_lock<mutex> lock(frame_queue_mutex);
- frame_queue_nonempty.wait(lock, [this]{ return copy_thread_should_quit || !pending_audio_frames.empty(); });
- if (copy_thread_should_quit) return;
+ frame_queue_nonempty.wait(lock, [this]{ return storage_thread_should_quit || !pending_audio_frames.empty(); });
+ if (storage_thread_should_quit && pending_audio_frames.empty()) return;
auto it = pending_audio_frames.begin();
if (it->first > task.pts) break;
audio_pts = it->first;
// wait until there's an encoded frame
unique_lock<mutex> lock(storage_task_queue_mutex);
storage_task_queue_changed.wait(lock, [this]{ return storage_thread_should_quit || !storage_task_queue.empty(); });
- if (storage_thread_should_quit) return;
+ if (storage_thread_should_quit && storage_task_queue.empty()) return;
current = move(storage_task_queue.front());
storage_task_queue.pop();
}
storage_thread = thread(&H264Encoder::storage_task_thread, this);
- copy_thread = thread([this]{
+ encode_thread = thread([this]{
//SDL_GL_MakeCurrent(window, context);
QOpenGLContext *context = create_context(this->surface);
eglBindAPI(EGL_OPENGL_API);
eglGetError());
exit(1);
}
- copy_thread_func();
+ encode_thread_func();
});
}
H264Encoder::~H264Encoder()
{
{
- unique_lock<mutex> lock(storage_task_queue_mutex);
- storage_thread_should_quit = true;
- storage_task_queue_changed.notify_all();
+ unique_lock<mutex> lock(frame_queue_mutex);
+ encode_thread_should_quit = true;
+ frame_queue_nonempty.notify_all();
}
+ encode_thread.join();
{
- unique_lock<mutex> lock(frame_queue_mutex);
- copy_thread_should_quit = true;
+ unique_lock<mutex> lock(storage_task_queue_mutex);
+ storage_thread_should_quit = true;
frame_queue_nonempty.notify_all();
+ storage_task_queue_changed.notify_all();
}
storage_thread.join();
- copy_thread.join();
release_encode();
deinit_va();
frame_queue_nonempty.notify_all();
}
-void H264Encoder::copy_thread_func()
+void H264Encoder::encode_thread_func()
{
int64_t last_dts = -1;
+ int gop_start_display_frame_num = 0;
for (int encoding_frame_num = 0; ; ++encoding_frame_num) {
PendingFrame frame;
int pts_lag;
- int frame_type;
+ int frame_type, display_frame_num;
encoding2display_order(encoding_frame_num, intra_period, intra_idr_period, ip_period,
- ¤t_frame_display, &frame_type, &pts_lag);
+ &display_frame_num, &frame_type, &pts_lag);
if (frame_type == FRAME_IDR) {
numShortTerm = 0;
current_frame_num = 0;
- current_IDR_display = current_frame_display;
+ gop_start_display_frame_num = display_frame_num;
}
{
unique_lock<mutex> lock(frame_queue_mutex);
- frame_queue_nonempty.wait(lock, [this]{ return copy_thread_should_quit || pending_video_frames.count(current_frame_display) != 0; });
- if (copy_thread_should_quit) {
+ frame_queue_nonempty.wait(lock, [this, display_frame_num]{
+ return encode_thread_should_quit || pending_video_frames.count(display_frame_num) != 0;
+ });
+ if (encode_thread_should_quit && pending_video_frames.count(display_frame_num) == 0) {
+ // We have queued frames that were supposed to be B-frames,
+ // but will be no P-frame to encode them against. Encode them all
+ // as P-frames instead. Note that this happens under the mutex,
+ // but nobody else uses it at this point, since we're shutting down,
+ // so there's no contention.
+ encode_remaining_frames_as_p(encoding_frame_num, gop_start_display_frame_num, last_dts);
return;
} else {
- frame = move(pending_video_frames[current_frame_display]);
- pending_video_frames.erase(current_frame_display);
+ frame = move(pending_video_frames[display_frame_num]);
+ pending_video_frames.erase(display_frame_num);
}
}
}
last_dts = dts;
- encode_frame(frame, encoding_frame_num, frame_type, frame.pts, dts);
+ 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 frame_type, int64_t pts, int64_t 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);
frame.input_frames.clear();
// Unmap the image.
- GLSurface *surf = &gl_surfaces[current_frame_display % SURFACE_NUM];
+ 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);
if (frame_type == FRAME_IDR) {
render_sequence();
- render_picture(frame_type);
+ render_picture(frame_type, display_frame_num, gop_start_display_frame_num);
if (h264_packedheader) {
render_packedsequence();
render_packedpicture();
}
} else {
//render_sequence();
- render_picture(frame_type);
+ render_picture(frame_type, display_frame_num, gop_start_display_frame_num);
}
- render_slice(encoding_frame_num, frame_type);
+ render_slice(encoding_frame_num, display_frame_num, gop_start_display_frame_num, frame_type);
va_status = vaEndPicture(va_dpy, context_id);
CHECK_VASTATUS(va_status, "vaEndPicture");
// so now the data is done encoding (well, async job kicked off)...
// we send that to the storage thread
storage_task tmp;
- tmp.display_order = current_frame_display;
+ tmp.display_order = display_frame_num;
tmp.frame_type = frame_type;
tmp.pts = pts;
tmp.dts = dts;