VA_RC_VCM,
VA_RC_NONE,
};
-static unsigned long long current_IDR_display = 0;
static unsigned int current_frame_num = 0;
static int misc_priv_type = 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, int display_frame_num)
+static int render_picture(int frame_type, int display_frame_num, int gop_start_display_frame_num)
{
VABufferID pic_param_buf;
VAStatus va_status;
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((display_frame_num - 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;
free(packedslice_buffer);
}
-static int render_slice(int encoding_frame_num, int display_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 = (display_frame_num - 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;
if (frame_type == FRAME_IDR) {
numShortTerm = 0;
current_frame_num = 0;
- current_IDR_display = display_frame_num;
+ gop_start_display_frame_num = display_frame_num;
}
{
unique_lock<mutex> lock(frame_queue_mutex);
frame_queue_nonempty.wait(lock, [this, display_frame_num]{
- return copy_thread_should_quit || pending_video_frames.count(display_frame_num) != 0;
+ return encode_thread_should_quit || pending_video_frames.count(display_frame_num) != 0;
});
- if (copy_thread_should_quit) {
+ if (encode_thread_should_quit) {
return;
} else {
frame = move(pending_video_frames[display_frame_num]);
}
last_dts = dts;
- encode_frame(frame, encoding_frame_num, display_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_frame(H264Encoder::PendingFrame frame, int encoding_frame_num, int display_frame_num,
+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.
if (frame_type == FRAME_IDR) {
render_sequence();
- render_picture(frame_type, display_frame_num);
+ 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, display_frame_num);
+ render_picture(frame_type, display_frame_num, gop_start_display_frame_num);
}
- render_slice(encoding_frame_num, display_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");
projects / nageru / blobdiff