#include "httpd.h"
#include "timebase.h"
+using namespace std;
+
class QOpenGLContext;
class QSurface;
VA_RC_VCM,
VA_RC_NONE,
};
-static unsigned long long current_frame_encoding = 0;
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 current_frame_type;
static int misc_priv_type = 0;
static int misc_priv_value = 0;
sort_one(ref, j+1, right, list1_ascending, frame_idx);
}
-static int update_ReferenceFrames(void)
+static int update_ReferenceFrames(int frame_type)
{
int i;
- if (current_frame_type == FRAME_B)
+ if (frame_type == FRAME_B)
return 0;
CurrentCurrPic.flags = VA_PICTURE_H264_SHORT_TERM_REFERENCE;
ReferenceFrames[i] = ReferenceFrames[i-1];
ReferenceFrames[0] = CurrentCurrPic;
- if (current_frame_type != FRAME_B)
- current_frame_num++;
+ current_frame_num++;
if (current_frame_num > MaxFrameNum)
current_frame_num = 0;
}
-static int update_RefPicList(void)
+static int update_RefPicList(int frame_type)
{
unsigned int current_poc = CurrentCurrPic.TopFieldOrderCnt;
- if (current_frame_type == FRAME_P) {
+ if (frame_type == FRAME_P) {
memcpy(RefPicList0_P, ReferenceFrames, numShortTerm * sizeof(VAPictureH264));
sort_one(RefPicList0_P, 0, numShortTerm-1, 0, 1);
}
- if (current_frame_type == FRAME_B) {
+ if (frame_type == FRAME_B) {
memcpy(RefPicList0_B, ReferenceFrames, numShortTerm * sizeof(VAPictureH264));
sort_two(RefPicList0_B, 0, numShortTerm-1, current_poc, 0,
1, 0, 1);
return 0;
}
-static int calc_poc(int pic_order_cnt_lsb)
+static int calc_poc(int pic_order_cnt_lsb, int frame_type)
{
static int PicOrderCntMsb_ref = 0, pic_order_cnt_lsb_ref = 0;
int prevPicOrderCntMsb, prevPicOrderCntLsb;
int PicOrderCntMsb, TopFieldOrderCnt;
- if (current_frame_type == FRAME_IDR)
+ if (frame_type == FRAME_IDR)
prevPicOrderCntMsb = prevPicOrderCntLsb = 0;
else {
prevPicOrderCntMsb = PicOrderCntMsb_ref;
TopFieldOrderCnt = PicOrderCntMsb + pic_order_cnt_lsb;
- if (current_frame_type != FRAME_B) {
+ if (frame_type != FRAME_B) {
PicOrderCntMsb_ref = PicOrderCntMsb;
pic_order_cnt_lsb_ref = pic_order_cnt_lsb;
}
return TopFieldOrderCnt;
}
-static int render_picture(void)
+static int render_picture(int frame_type)
{
VABufferID pic_param_buf;
VAStatus va_status;
pic_param.CurrPic.picture_id = gl_surfaces[current_frame_display % 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);
+ pic_param.CurrPic.TopFieldOrderCnt = calc_poc((current_frame_display - current_IDR_display) % MaxPicOrderCntLsb, frame_type);
pic_param.CurrPic.BottomFieldOrderCnt = pic_param.CurrPic.TopFieldOrderCnt;
CurrentCurrPic = pic_param.CurrPic;
- if (getenv("TO_DEL")) { /* set RefPicList into ReferenceFrames */
- update_RefPicList(); /* calc RefPicList */
- memset(pic_param.ReferenceFrames, 0xff, 16 * sizeof(VAPictureH264)); /* invalid all */
- if (current_frame_type == FRAME_P) {
- pic_param.ReferenceFrames[0] = RefPicList0_P[0];
- } else if (current_frame_type == FRAME_B) {
- pic_param.ReferenceFrames[0] = RefPicList0_B[0];
- pic_param.ReferenceFrames[1] = RefPicList1_B[0];
- }
- } else {
- memcpy(pic_param.ReferenceFrames, ReferenceFrames, numShortTerm*sizeof(VAPictureH264));
- for (i = numShortTerm; i < SURFACE_NUM; i++) {
- pic_param.ReferenceFrames[i].picture_id = VA_INVALID_SURFACE;
- pic_param.ReferenceFrames[i].flags = VA_PICTURE_H264_INVALID;
- }
+ memcpy(pic_param.ReferenceFrames, ReferenceFrames, numShortTerm*sizeof(VAPictureH264));
+ for (i = numShortTerm; i < SURFACE_NUM; i++) {
+ pic_param.ReferenceFrames[i].picture_id = VA_INVALID_SURFACE;
+ pic_param.ReferenceFrames[i].flags = VA_PICTURE_H264_INVALID;
}
- pic_param.pic_fields.bits.idr_pic_flag = (current_frame_type == FRAME_IDR);
- pic_param.pic_fields.bits.reference_pic_flag = (current_frame_type != FRAME_B);
+ pic_param.pic_fields.bits.idr_pic_flag = (frame_type == FRAME_IDR);
+ pic_param.pic_fields.bits.reference_pic_flag = (frame_type != FRAME_B);
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;
free(packedslice_buffer);
}
-static int render_slice(void)
+static int render_slice(int encoding_frame_num, int frame_type)
{
VABufferID slice_param_buf;
VAStatus va_status;
int i;
- update_RefPicList();
+ update_RefPicList(frame_type);
/* one frame, one slice */
slice_param.macroblock_address = 0;
slice_param.num_macroblocks = frame_width_mbaligned * frame_height_mbaligned/(16*16); /* Measured by MB */
- slice_param.slice_type = (current_frame_type == FRAME_IDR)?2:current_frame_type;
- if (current_frame_type == FRAME_IDR) {
- if (current_frame_encoding != 0)
+ slice_param.slice_type = (frame_type == FRAME_IDR)?2:frame_type;
+ if (frame_type == FRAME_IDR) {
+ if (encoding_frame_num != 0)
++slice_param.idr_pic_id;
- } else if (current_frame_type == FRAME_P) {
+ } else if (frame_type == FRAME_P) {
int refpiclist0_max = h264_maxref & 0xffff;
memcpy(slice_param.RefPicList0, RefPicList0_P, refpiclist0_max*sizeof(VAPictureH264));
slice_param.RefPicList0[i].picture_id = VA_INVALID_SURFACE;
slice_param.RefPicList0[i].flags = VA_PICTURE_H264_INVALID;
}
- } else if (current_frame_type == FRAME_B) {
+ } else if (frame_type == FRAME_B) {
int refpiclist0_max = h264_maxref & 0xffff;
int refpiclist1_max = (h264_maxref >> 16) & 0xffff;
// Encode and add all audio frames up to and including the pts of this video frame.
for ( ;; ) {
int64_t audio_pts;
- std::vector<float> audio;
+ 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(); });
// this is weird. but it seems to put a new frame onto the queue
void H264Encoder::storage_task_enqueue(storage_task task)
{
- std::unique_lock<std::mutex> lock(storage_task_queue_mutex);
+ unique_lock<mutex> lock(storage_task_queue_mutex);
storage_task_queue.push(move(task));
srcsurface_status[task.display_order % SURFACE_NUM] = SRC_SURFACE_IN_ENCODING;
storage_task_queue_changed.notify_all();
storage_task current;
{
// wait until there's an encoded frame
- std::unique_lock<std::mutex> lock(storage_task_queue_mutex);
+ 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;
current = move(storage_task_queue.front());
save_codeddata(move(current));
{
- std::unique_lock<std::mutex> lock(storage_task_queue_mutex);
+ unique_lock<mutex> lock(storage_task_queue_mutex);
srcsurface_status[current.display_order % SURFACE_NUM] = SRC_SURFACE_FREE;
storage_task_queue_changed.notify_all();
}
frame_width_mbaligned = (frame_width + 15) & (~15);
frame_height_mbaligned = (frame_height + 15) & (~15);
frame_bitrate = 15000000; // / 60;
- current_frame_encoding = 0;
//print_input();
memset(&pic_param, 0, sizeof(pic_param));
memset(&slice_param, 0, sizeof(slice_param));
- storage_thread = std::thread(&H264Encoder::storage_task_thread, this);
+ storage_thread = thread(&H264Encoder::storage_task_thread, this);
- copy_thread = std::thread([this]{
+ copy_thread = thread([this]{
//SDL_GL_MakeCurrent(window, context);
QOpenGLContext *context = create_context(this->surface);
eglBindAPI(EGL_OPENGL_API);
{
{
// Wait until this frame slot is done encoding.
- std::unique_lock<std::mutex> lock(storage_task_queue_mutex);
+ unique_lock<mutex> lock(storage_task_queue_mutex);
storage_task_queue_changed.wait(lock, [this]{ return storage_thread_should_quit || (srcsurface_status[current_storage_frame % SURFACE_NUM] == SRC_SURFACE_FREE); });
if (storage_thread_should_quit) return false;
}
return true;
}
-void H264Encoder::add_audio(int64_t pts, std::vector<float> audio)
+void H264Encoder::add_audio(int64_t pts, vector<float> audio)
{
{
unique_lock<mutex> lock(frame_queue_mutex);
frame_queue_nonempty.notify_all();
}
-void H264Encoder::end_frame(RefCountedGLsync fence, int64_t pts, const std::vector<RefCountedFrame> &input_frames)
+void H264Encoder::end_frame(RefCountedGLsync fence, int64_t pts, const vector<RefCountedFrame> &input_frames)
{
{
unique_lock<mutex> lock(frame_queue_mutex);
void H264Encoder::copy_thread_func()
{
int64_t last_dts = -1;
- for ( ;; ) {
+ for (int encoding_frame_num = 0; ; ++encoding_frame_num) {
PendingFrame frame;
int pts_lag;
- encoding2display_order(current_frame_encoding, intra_period, intra_idr_period, ip_period,
- ¤t_frame_display, ¤t_frame_type, &pts_lag);
- if (current_frame_type == FRAME_IDR) {
+ int frame_type;
+ encoding2display_order(encoding_frame_num, intra_period, intra_idr_period, ip_period,
+ ¤t_frame_display, &frame_type, &pts_lag);
+ if (frame_type == FRAME_IDR) {
numShortTerm = 0;
current_frame_num = 0;
current_IDR_display = current_frame_display;
{
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) return;
- frame = move(pending_video_frames[current_frame_display]);
- pending_video_frames.erase(current_frame_display);
- }
-
- // 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[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();
+ if (copy_thread_should_quit) {
+ return;
+ } else {
+ frame = move(pending_video_frames[current_frame_display]);
+ pending_video_frames.erase(current_frame_display);
}
- } else {
- //render_sequence();
- render_picture();
}
- render_slice();
-
- va_status = vaEndPicture(va_dpy, context_id);
- CHECK_VASTATUS(va_status, "vaEndPicture");
- // Determine the pts and dts of this frame.
- int64_t pts = frame.pts;
+ // Determine the dts of this frame.
int64_t dts;
if (pts_lag == -1) {
assert(last_dts != -1);
dts = last_dts + (TIMEBASE / MAX_FPS);
} else {
- dts = pts - pts_lag;
+ dts = frame.pts - pts_lag;
}
last_dts = dts;
- // 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.frame_type = current_frame_type;
- tmp.pts = pts;
- tmp.dts = dts;
- storage_task_enqueue(move(tmp));
-
- update_ReferenceFrames();
- ++current_frame_encoding;
+ encode_frame(frame, encoding_frame_num, frame_type, frame.pts, dts);
+ }
+}
+
+void H264Encoder::encode_frame(H264Encoder::PendingFrame frame, int encoding_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[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 (frame_type == FRAME_IDR) {
+ render_sequence();
+ render_picture(frame_type);
+ if (h264_packedheader) {
+ render_packedsequence();
+ render_packedpicture();
+ }
+ } else {
+ //render_sequence();
+ render_picture(frame_type);
}
+ render_slice(encoding_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.frame_type = frame_type;
+ tmp.pts = pts;
+ tmp.dts = dts;
+ storage_task_enqueue(move(tmp));
+
+ update_ReferenceFrames(frame_type);
}
projects / nageru / blobdiff