X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=h264encode.cpp;h=c7fdeac58d30f4d78c986e78e355ed10086cfce1;hb=593173ffcdbccff777720b3c41c3e771fa93a10a;hp=3d8b463173aab3b5d2f3486d6b02688dc2db8f57;hpb=5a94066158c0277c91d44afb980b83ed8ba2898e;p=nageru diff --git a/h264encode.cpp b/h264encode.cpp index 3d8b463..c7fdeac 100644 --- a/h264encode.cpp +++ b/h264encode.cpp @@ -6,11 +6,14 @@ #include #include #include +extern "C" { #include +#include #include #include #include #include +} #include #include #include @@ -19,8 +22,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -33,6 +38,8 @@ #include "httpd.h" #include "timebase.h" +using namespace std; + class QOpenGLContext; class QSurface; @@ -71,61 +78,13 @@ class QSurface; #define PROFILE_IDC_HIGH 100 #define BITSTREAM_ALLOCATE_STEPPING 4096 - #define SURFACE_NUM 16 /* 16 surfaces for source YUV */ -static VADisplay va_dpy; -static VAProfile h264_profile = (VAProfile)~0; -static VAConfigAttrib config_attrib[VAConfigAttribTypeMax]; -static int config_attrib_num = 0, enc_packed_header_idx; - -struct GLSurface { - VASurfaceID src_surface, ref_surface; - VABufferID coded_buf; - - VAImage surface_image; - GLuint y_tex, cbcr_tex; - EGLImage y_egl_image, cbcr_egl_image; -}; -GLSurface gl_surfaces[SURFACE_NUM]; - -static VAConfigID config_id; -static VAContextID context_id; -static VAEncSequenceParameterBufferH264 seq_param; -static VAEncPictureParameterBufferH264 pic_param; -static VAEncSliceParameterBufferH264 slice_param; -static VAPictureH264 CurrentCurrPic; -static VAPictureH264 ReferenceFrames[16], RefPicList0_P[32], RefPicList0_B[32], RefPicList1_B[32]; - -static unsigned int MaxFrameNum = (2<<16); -static unsigned int MaxPicOrderCntLsb = (2<<8); -static unsigned int Log2MaxFrameNum = 16; -static unsigned int Log2MaxPicOrderCntLsb = 8; - -static unsigned int num_ref_frames = 2; -static unsigned int numShortTerm = 0; -static int constraint_set_flag = 0; -static int h264_packedheader = 0; /* support pack header? */ -static int h264_maxref = (1<<16|1); -static int h264_entropy_mode = 1; /* cabac */ - -static char *coded_fn = NULL; - -static int frame_width = 176; -static int frame_height = 144; -static int frame_width_mbaligned; -static int frame_height_mbaligned; -static int frame_rate = FPS; -static unsigned int frame_bitrate = 0; -static unsigned int frame_slices = 1; -static double frame_size = 0; -static int initial_qp = 15; -//static int initial_qp = 28; -static int minimal_qp = 0; -static int intra_period = 30; -static int intra_idr_period = FPS; -static int ip_period = 3; -static int rc_mode = -1; -static int rc_default_modes[] = { + +static constexpr unsigned int MaxFrameNum = (2<<16); +static constexpr unsigned int MaxPicOrderCntLsb = (2<<8); +static constexpr unsigned int Log2MaxFrameNum = 16; +static constexpr unsigned int Log2MaxPicOrderCntLsb = 8; +static constexpr int rc_default_modes[] = { // Priority list of modes. VA_RC_VBR, VA_RC_CQP, VA_RC_VBR_CONSTRAINED, @@ -133,14 +92,6 @@ static int rc_default_modes[] = { 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; /* thread to save coded data */ #define SRC_SURFACE_FREE 0 @@ -155,6 +106,132 @@ typedef struct __bitstream bitstream; using namespace std; +class H264EncoderImpl { +public: + H264EncoderImpl(QSurface *surface, int width, int height, HTTPD *httpd); + ~H264EncoderImpl(); + void add_audio(int64_t pts, vector audio); + bool begin_frame(GLuint *y_tex, GLuint *cbcr_tex); + void end_frame(RefCountedGLsync fence, int64_t pts, const vector &input_frames); + void shutdown(); + +private: + struct storage_task { + unsigned long long display_order; + int frame_type; + vector audio; + int64_t pts, dts; + }; + struct PendingFrame { + RefCountedGLsync fence; + vector input_frames; + int64_t pts; + }; + + void encode_thread_func(); + void encode_remaining_frames_as_p(int encoding_frame_num, int gop_start_display_frame_num, int64_t last_dts); + void encode_frame(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); + void storage_task_thread(); + void storage_task_enqueue(storage_task task); + void save_codeddata(storage_task task); + int render_packedsequence(); + int render_packedpicture(); + void render_packedslice(); + int render_sequence(); + int render_picture(int frame_type, int display_frame_num, int gop_start_display_frame_num); + void sps_rbsp(bitstream *bs); + void pps_rbsp(bitstream *bs); + int build_packed_pic_buffer(unsigned char **header_buffer); + int render_slice(int encoding_frame_num, int display_frame_num, int gop_start_display_frame_num, int frame_type); + void slice_header(bitstream *bs); + int build_packed_seq_buffer(unsigned char **header_buffer); + int build_packed_slice_buffer(unsigned char **header_buffer); + int init_va(); + int deinit_va(); + VADisplay va_open_display(void); + void va_close_display(VADisplay va_dpy); + int setup_encode(); + int release_encode(); + void update_ReferenceFrames(int frame_type); + int update_RefPicList(int frame_type); + + bool is_shutdown = false; + + thread encode_thread, storage_thread; + + mutex storage_task_queue_mutex; + condition_variable storage_task_queue_changed; + int srcsurface_status[SURFACE_NUM]; // protected by storage_task_queue_mutex + queue storage_task_queue; // protected by storage_task_queue_mutex + bool storage_thread_should_quit = false; // protected by storage_task_queue_mutex + + mutex frame_queue_mutex; + condition_variable frame_queue_nonempty; + bool encode_thread_should_quit = false; // under frame_queue_mutex + + int current_storage_frame; + + map pending_video_frames; // under frame_queue_mutex + map> pending_audio_frames; // under frame_queue_mutex + QSurface *surface; + + AVCodecContext *context_audio; + HTTPD *httpd; + + Display *x11_display; + Window x11_window; + + // Encoder parameters + VADisplay va_dpy; + VAProfile h264_profile = (VAProfile)~0; + VAConfigAttrib config_attrib[VAConfigAttribTypeMax]; + int config_attrib_num = 0, enc_packed_header_idx; + + struct GLSurface { + VASurfaceID src_surface, ref_surface; + VABufferID coded_buf; + + VAImage surface_image; + GLuint y_tex, cbcr_tex; + EGLImage y_egl_image, cbcr_egl_image; + }; + GLSurface gl_surfaces[SURFACE_NUM]; + + VAConfigID config_id; + VAContextID context_id; + VAEncSequenceParameterBufferH264 seq_param; + VAEncPictureParameterBufferH264 pic_param; + VAEncSliceParameterBufferH264 slice_param; + VAPictureH264 CurrentCurrPic; + VAPictureH264 ReferenceFrames[16], RefPicList0_P[32], RefPicList0_B[32], RefPicList1_B[32]; + + // Static quality settings. + static constexpr unsigned int frame_bitrate = 15000000 / 60; // Doesn't really matter; only initial_qp does. + static constexpr unsigned int num_ref_frames = 2; + static constexpr int initial_qp = 15; + static constexpr int minimal_qp = 0; + static constexpr int intra_period = 30; + static constexpr int intra_idr_period = MAX_FPS; // About a second; more at lower frame rates. Not ideal. + + // Quality settings that are meant to be static, but might be overridden + // by the profile. + int constraint_set_flag = 0; + int h264_packedheader = 0; /* support pack header? */ + int h264_maxref = (1<<16|1); + int h264_entropy_mode = 1; /* cabac */ + int ip_period = 3; + + int rc_mode = -1; + unsigned int current_frame_num = 0; + unsigned int numShortTerm = 0; + + int frame_width; + int frame_height; + int frame_width_mbaligned; + int frame_height_mbaligned; +}; + // Supposedly vaRenderPicture() is supposed to destroy the buffer implicitly, // but if we don't delete it here, we get leaks. The GStreamer implementation // does the same. @@ -164,7 +241,7 @@ static void render_picture_and_delete(VADisplay dpy, VAContextID context, VABuff CHECK_VASTATUS(va_status, "vaRenderPicture"); for (int i = 0; i < num_buffers; ++i) { - va_status = vaDestroyBuffer(va_dpy, buffers[i]); + va_status = vaDestroyBuffer(dpy, buffers[i]); CHECK_VASTATUS(va_status, "vaDestroyBuffer"); } } @@ -216,7 +293,11 @@ bitstream_put_ui(bitstream *bs, unsigned int val, int size_in_bits) bs->buffer[pos] = (bs->buffer[pos] << size_in_bits | val); } else { size_in_bits -= bit_left; - bs->buffer[pos] = (bs->buffer[pos] << bit_left) | (val >> size_in_bits); + if (bit_left >= 32) { + bs->buffer[pos] = (val >> size_in_bits); + } else { + bs->buffer[pos] = (bs->buffer[pos] << bit_left) | (val >> size_in_bits); + } bs->buffer[pos] = va_swap32(bs->buffer[pos]); if (pos + 1 == bs->max_size_in_dword) { @@ -295,7 +376,7 @@ static void nal_header(bitstream *bs, int nal_ref_idc, int nal_unit_type) bitstream_put_ui(bs, nal_unit_type, 5); } -static void sps_rbsp(bitstream *bs) +void H264EncoderImpl::sps_rbsp(bitstream *bs) { int profile_idc = PROFILE_IDC_BASELINE; @@ -403,7 +484,7 @@ static void sps_rbsp(bitstream *bs) } -static void pps_rbsp(bitstream *bs) +void H264EncoderImpl::pps_rbsp(bitstream *bs) { bitstream_put_ue(bs, pic_param.pic_parameter_set_id); /* pic_parameter_set_id */ bitstream_put_ue(bs, pic_param.seq_parameter_set_id); /* seq_parameter_set_id */ @@ -436,7 +517,7 @@ static void pps_rbsp(bitstream *bs) rbsp_trailing_bits(bs); } -static void slice_header(bitstream *bs) +void H264EncoderImpl::slice_header(bitstream *bs) { int first_mb_in_slice = slice_param.macroblock_address; @@ -531,8 +612,7 @@ static void slice_header(bitstream *bs) } } -static int -build_packed_pic_buffer(unsigned char **header_buffer) +int H264EncoderImpl::build_packed_pic_buffer(unsigned char **header_buffer) { bitstream bs; @@ -546,8 +626,8 @@ build_packed_pic_buffer(unsigned char **header_buffer) return bs.bit_offset; } -static int -build_packed_seq_buffer(unsigned char **header_buffer) +int +H264EncoderImpl::build_packed_seq_buffer(unsigned char **header_buffer) { bitstream bs; @@ -561,7 +641,7 @@ build_packed_seq_buffer(unsigned char **header_buffer) return bs.bit_offset; } -static int build_packed_slice_buffer(unsigned char **header_buffer) +int H264EncoderImpl::build_packed_slice_buffer(unsigned char **header_buffer) { bitstream bs; int is_idr = !!pic_param.pic_fields.bits.idr_pic_flag; @@ -619,7 +699,7 @@ static int build_packed_slice_buffer(unsigned char **header_buffer) // // Getting pts and dts right with variable frame rate (VFR) and B-frames can be a // bit tricky. We assume first of all that the frame rate never goes _above_ -// , which gives us a frame period N. The decoder can always decode +// MAX_FPS, which gives us a frame period N. The decoder can always decode // in at least this speed, as long at dts <= pts (the frame is not attempted // presented before it is decoded). Furthermore, we never have longer chains of // B-frames than a fixed constant C. (In a B-frame chain, we say that the base @@ -665,9 +745,9 @@ static int build_packed_slice_buffer(unsigned char **header_buffer) #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; @@ -712,7 +792,7 @@ void encoding2display_order( *displaying_order = encoding_order; // IDR frames are a special case; I honestly can't find the logic behind // why this is the right thing, but it seems to line up nicely in practice :-) - *pts_lag = TIMEBASE / frame_rate; + *pts_lag = TIMEBASE / MAX_FPS; } else if (((encoding_order_gop - 1) % ip_period) != 0) { /* B frames */ *frame_type = FRAME_B; *displaying_order = encoding_order - 1; @@ -731,7 +811,7 @@ void encoding2display_order( } -static const char *rc_to_string(int rcmode) +static const char *rc_to_string(int rc_mode) { switch (rc_mode) { case VA_RC_NONE: @@ -751,160 +831,7 @@ static const char *rc_to_string(int rcmode) } } -#if 0 -static int process_cmdline(int argc, char *argv[]) -{ - char c; - const struct option long_opts[] = { - {"help", no_argument, NULL, 0 }, - {"bitrate", required_argument, NULL, 1 }, - {"minqp", required_argument, NULL, 2 }, - {"initialqp", required_argument, NULL, 3 }, - {"intra_period", required_argument, NULL, 4 }, - {"idr_period", required_argument, NULL, 5 }, - {"ip_period", required_argument, NULL, 6 }, - {"rcmode", required_argument, NULL, 7 }, - {"srcyuv", required_argument, NULL, 9 }, - {"recyuv", required_argument, NULL, 10 }, - {"fourcc", required_argument, NULL, 11 }, - {"syncmode", no_argument, NULL, 12 }, - {"enablePSNR", no_argument, NULL, 13 }, - {"prit", required_argument, NULL, 14 }, - {"priv", required_argument, NULL, 15 }, - {"framecount", required_argument, NULL, 16 }, - {"entropy", required_argument, NULL, 17 }, - {"profile", required_argument, NULL, 18 }, - {NULL, no_argument, NULL, 0 }}; - int long_index; - - while ((c =getopt_long_only(argc, argv, "w:h:n:f:o:?", long_opts, &long_index)) != EOF) { - switch (c) { - case 'w': - frame_width = atoi(optarg); - break; - case 'h': - frame_height = atoi(optarg); - break; - case 'n': - case 'f': - frame_rate = atoi(optarg); - break; - case 'o': - coded_fn = strdup(optarg); - break; - case 0: - print_help(); - exit(0); - case 1: - frame_bitrate = atoi(optarg); - break; - case 2: - minimal_qp = atoi(optarg); - break; - case 3: - initial_qp = atoi(optarg); - break; - case 4: - intra_period = atoi(optarg); - break; - case 5: - intra_idr_period = atoi(optarg); - break; - case 6: - ip_period = atoi(optarg); - break; - case 7: - rc_mode = string_to_rc(optarg); - if (rc_mode < 0) { - print_help(); - exit(1); - } - break; - case 9: - srcyuv_fn = strdup(optarg); - break; - case 11: - srcyuv_fourcc = string_to_fourcc(optarg); - if (srcyuv_fourcc <= 0) { - print_help(); - exit(1); - } - break; - case 13: - calc_psnr = 1; - break; - case 14: - misc_priv_type = strtol(optarg, NULL, 0); - break; - case 15: - misc_priv_value = strtol(optarg, NULL, 0); - break; - case 17: - h264_entropy_mode = atoi(optarg) ? 1: 0; - break; - case 18: - if (strncmp(optarg, "BP", 2) == 0) - h264_profile = VAProfileH264Baseline; - else if (strncmp(optarg, "MP", 2) == 0) - h264_profile = VAProfileH264Main; - else if (strncmp(optarg, "HP", 2) == 0) - h264_profile = VAProfileH264High; - else - h264_profile = (VAProfile)0; - break; - case ':': - case '?': - print_help(); - exit(0); - } - } - - if (ip_period < 1) { - printf(" ip_period must be greater than 0\n"); - exit(0); - } - if (intra_period != 1 && intra_period % ip_period != 0) { - printf(" intra_period must be a multiplier of ip_period\n"); - exit(0); - } - if (intra_period != 0 && intra_idr_period % intra_period != 0) { - printf(" intra_idr_period must be a multiplier of intra_period\n"); - exit(0); - } - - if (frame_bitrate == 0) - frame_bitrate = frame_width * frame_height * 12 * frame_rate / 50; - - if (coded_fn == NULL) { - struct stat buf; - if (stat("/tmp", &buf) == 0) - coded_fn = strdup("/tmp/test.264"); - else if (stat("/sdcard", &buf) == 0) - coded_fn = strdup("/sdcard/test.264"); - else - coded_fn = strdup("./test.264"); - } - - - frame_width_mbaligned = (frame_width + 15) & (~15); - frame_height_mbaligned = (frame_height + 15) & (~15); - if (frame_width != frame_width_mbaligned || - frame_height != frame_height_mbaligned) { - printf("Source frame is %dx%d and will code clip to %dx%d with crop\n", - frame_width, frame_height, - frame_width_mbaligned, frame_height_mbaligned - ); - } - - return 0; -} -#endif - -static Display *x11_display; -static Window x11_window; - -VADisplay -va_open_display(void) +VADisplay H264EncoderImpl::va_open_display(void) { x11_display = XOpenDisplay(NULL); if (!x11_display) { @@ -914,8 +841,7 @@ va_open_display(void) return vaGetDisplay(x11_display); } -void -va_close_display(VADisplay va_dpy) +void H264EncoderImpl::va_close_display(VADisplay va_dpy) { if (!x11_display) return; @@ -929,7 +855,7 @@ va_close_display(VADisplay va_dpy) x11_display = NULL; } -static int init_va(void) +int H264EncoderImpl::init_va() { VAProfile profile_list[]={VAProfileH264High, VAProfileH264Main, VAProfileH264Baseline, VAProfileH264ConstrainedBaseline}; VAEntrypoint *entrypoints; @@ -973,28 +899,23 @@ static int init_va(void) } else { switch (h264_profile) { case VAProfileH264Baseline: - printf("Use profile VAProfileH264Baseline\n"); ip_period = 1; constraint_set_flag |= (1 << 0); /* Annex A.2.1 */ h264_entropy_mode = 0; break; case VAProfileH264ConstrainedBaseline: - printf("Use profile VAProfileH264ConstrainedBaseline\n"); constraint_set_flag |= (1 << 0 | 1 << 1); /* Annex A.2.2 */ ip_period = 1; break; case VAProfileH264Main: - printf("Use profile VAProfileH264Main\n"); constraint_set_flag |= (1 << 1); /* Annex A.2.2 */ break; case VAProfileH264High: constraint_set_flag |= (1 << 3); /* Annex A.2.4 */ - printf("Use profile VAProfileH264High\n"); break; default: - printf("unknow profile. Set to Baseline"); h264_profile = VAProfileH264Baseline; ip_period = 1; constraint_set_flag |= (1 << 0); /* Annex A.2.1 */ @@ -1024,23 +945,6 @@ static int init_va(void) if (attrib[VAConfigAttribRateControl].value != VA_ATTRIB_NOT_SUPPORTED) { int tmp = attrib[VAConfigAttribRateControl].value; - printf("Support rate control mode (0x%x):", tmp); - - if (tmp & VA_RC_NONE) - printf("NONE "); - if (tmp & VA_RC_CBR) - printf("CBR "); - if (tmp & VA_RC_VBR) - printf("VBR "); - if (tmp & VA_RC_VCM) - printf("VCM "); - if (tmp & VA_RC_CQP) - printf("CQP "); - if (tmp & VA_RC_VBR_CONSTRAINED) - printf("VBR_CONSTRAINED "); - - printf("\n"); - if (rc_mode == -1 || !(rc_mode & tmp)) { if (rc_mode != -1) { printf("Warning: Don't support the specified RateControl mode: %s!!!, switch to ", rc_to_string(rc_mode)); @@ -1052,8 +956,6 @@ static int init_va(void) break; } } - - printf("RateControl mode: %s\n", rc_to_string(rc_mode)); } config_attrib[config_attrib_num].type = VAConfigAttribRateControl; @@ -1065,29 +967,23 @@ static int init_va(void) if (attrib[VAConfigAttribEncPackedHeaders].value != VA_ATTRIB_NOT_SUPPORTED) { int tmp = attrib[VAConfigAttribEncPackedHeaders].value; - printf("Support VAConfigAttribEncPackedHeaders\n"); - h264_packedheader = 1; config_attrib[config_attrib_num].type = VAConfigAttribEncPackedHeaders; config_attrib[config_attrib_num].value = VA_ENC_PACKED_HEADER_NONE; if (tmp & VA_ENC_PACKED_HEADER_SEQUENCE) { - printf("Support packed sequence headers\n"); config_attrib[config_attrib_num].value |= VA_ENC_PACKED_HEADER_SEQUENCE; } if (tmp & VA_ENC_PACKED_HEADER_PICTURE) { - printf("Support packed picture headers\n"); config_attrib[config_attrib_num].value |= VA_ENC_PACKED_HEADER_PICTURE; } if (tmp & VA_ENC_PACKED_HEADER_SLICE) { - printf("Support packed slice headers\n"); config_attrib[config_attrib_num].value |= VA_ENC_PACKED_HEADER_SLICE; } if (tmp & VA_ENC_PACKED_HEADER_MISC) { - printf("Support packed misc headers\n"); config_attrib[config_attrib_num].value |= VA_ENC_PACKED_HEADER_MISC; } @@ -1096,19 +992,6 @@ static int init_va(void) } if (attrib[VAConfigAttribEncInterlaced].value != VA_ATTRIB_NOT_SUPPORTED) { - int tmp = attrib[VAConfigAttribEncInterlaced].value; - - printf("Support VAConfigAttribEncInterlaced\n"); - - if (tmp & VA_ENC_INTERLACED_FRAME) - printf("support VA_ENC_INTERLACED_FRAME\n"); - if (tmp & VA_ENC_INTERLACED_FIELD) - printf("Support VA_ENC_INTERLACED_FIELD\n"); - if (tmp & VA_ENC_INTERLACED_MBAFF) - printf("Support VA_ENC_INTERLACED_MBAFF\n"); - if (tmp & VA_ENC_INTERLACED_PAFF) - printf("Support VA_ENC_INTERLACED_PAFF\n"); - config_attrib[config_attrib_num].type = VAConfigAttribEncInterlaced; config_attrib[config_attrib_num].value = VA_ENC_PACKED_HEADER_NONE; config_attrib_num++; @@ -1116,35 +999,13 @@ static int init_va(void) if (attrib[VAConfigAttribEncMaxRefFrames].value != VA_ATTRIB_NOT_SUPPORTED) { h264_maxref = attrib[VAConfigAttribEncMaxRefFrames].value; - - printf("Support %d RefPicList0 and %d RefPicList1\n", - h264_maxref & 0xffff, (h264_maxref >> 16) & 0xffff ); - } - - if (attrib[VAConfigAttribEncMaxSlices].value != VA_ATTRIB_NOT_SUPPORTED) - printf("Support %d slices\n", attrib[VAConfigAttribEncMaxSlices].value); - - if (attrib[VAConfigAttribEncSliceStructure].value != VA_ATTRIB_NOT_SUPPORTED) { - int tmp = attrib[VAConfigAttribEncSliceStructure].value; - - printf("Support VAConfigAttribEncSliceStructure\n"); - - if (tmp & VA_ENC_SLICE_STRUCTURE_ARBITRARY_ROWS) - printf("Support VA_ENC_SLICE_STRUCTURE_ARBITRARY_ROWS\n"); - if (tmp & VA_ENC_SLICE_STRUCTURE_POWER_OF_TWO_ROWS) - printf("Support VA_ENC_SLICE_STRUCTURE_POWER_OF_TWO_ROWS\n"); - if (tmp & VA_ENC_SLICE_STRUCTURE_ARBITRARY_MACROBLOCKS) - printf("Support VA_ENC_SLICE_STRUCTURE_ARBITRARY_MACROBLOCKS\n"); - } - if (attrib[VAConfigAttribEncMacroblockInfo].value != VA_ATTRIB_NOT_SUPPORTED) { - printf("Support VAConfigAttribEncMacroblockInfo\n"); } free(entrypoints); return 0; } -static int setup_encode() +int H264EncoderImpl::setup_encode() { VAStatus va_status; VASurfaceID *tmp_surfaceid; @@ -1213,76 +1074,23 @@ static int setup_encode() return 0; } - - -#define partition(ref, field, key, ascending) \ - while (i <= j) { \ - if (ascending) { \ - while (ref[i].field < key) \ - i++; \ - while (ref[j].field > key) \ - j--; \ - } else { \ - while (ref[i].field > key) \ - i++; \ - while (ref[j].field < key) \ - j--; \ - } \ - if (i <= j) { \ - tmp = ref[i]; \ - ref[i] = ref[j]; \ - ref[j] = tmp; \ - i++; \ - j--; \ - } \ - } \ - -static void sort_one(VAPictureH264 ref[], int left, int right, - int ascending, int frame_idx) -{ - int i = left, j = right; - unsigned int key; - VAPictureH264 tmp; - - if (frame_idx) { - key = ref[(left + right) / 2].frame_idx; - partition(ref, frame_idx, key, ascending); - } else { - key = ref[(left + right) / 2].TopFieldOrderCnt; - partition(ref, TopFieldOrderCnt, (signed int)key, ascending); - } - - /* recursion */ - if (left < j) - sort_one(ref, left, j, ascending, frame_idx); - - if (i < right) - sort_one(ref, i, right, ascending, frame_idx); -} - -static void sort_two(VAPictureH264 ref[], int left, int right, unsigned int key, unsigned int frame_idx, - int partition_ascending, int list0_ascending, int list1_ascending) +// Given a list like 1 9 3 0 2 8 4 and a pivot element 3, will produce +// +// 2 1 0 [3] 4 8 9 +template +static void sort_two(T *begin, T *end, const T &pivot, const C &less_than) { - int i = left, j = right; - VAPictureH264 tmp; - - if (frame_idx) { - partition(ref, frame_idx, key, partition_ascending); - } else { - partition(ref, TopFieldOrderCnt, (signed int)key, partition_ascending); - } - - - sort_one(ref, left, i-1, list0_ascending, frame_idx); - sort_one(ref, j+1, right, list1_ascending, frame_idx); + T *middle = partition(begin, end, [&](const T &elem) { return less_than(elem, pivot); }); + sort(begin, middle, [&](const T &a, const T &b) { return less_than(b, a); }); + sort(middle, end, less_than); } -static int update_ReferenceFrames(void) +void H264EncoderImpl::update_ReferenceFrames(int frame_type) { int i; - if (current_frame_type == FRAME_B) - return 0; + if (frame_type == FRAME_B) + return; CurrentCurrPic.flags = VA_PICTURE_H264_SHORT_TERM_REFERENCE; numShortTerm++; @@ -1292,43 +1100,44 @@ static int update_ReferenceFrames(void) 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; - - return 0; } -static int update_RefPicList(void) +int H264EncoderImpl::update_RefPicList(int frame_type) { - unsigned int current_poc = CurrentCurrPic.TopFieldOrderCnt; + const auto descending_by_frame_idx = [](const VAPictureH264 &a, const VAPictureH264 &b) { + return a.frame_idx > b.frame_idx; + }; + const auto ascending_by_top_field_order_cnt = [](const VAPictureH264 &a, const VAPictureH264 &b) { + return a.TopFieldOrderCnt < b.TopFieldOrderCnt; + }; + const auto descending_by_top_field_order_cnt = [](const VAPictureH264 &a, const VAPictureH264 &b) { + return a.TopFieldOrderCnt > b.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) { + sort(&RefPicList0_P[0], &RefPicList0_P[numShortTerm], descending_by_frame_idx); + } else 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); + sort_two(&RefPicList0_B[0], &RefPicList0_B[numShortTerm], CurrentCurrPic, ascending_by_top_field_order_cnt); memcpy(RefPicList1_B, ReferenceFrames, numShortTerm * sizeof(VAPictureH264)); - sort_two(RefPicList1_B, 0, numShortTerm-1, current_poc, 0, - 0, 1, 0); + sort_two(&RefPicList1_B[0], &RefPicList1_B[numShortTerm], CurrentCurrPic, descending_by_top_field_order_cnt); } return 0; } -static int render_sequence(void) +int H264EncoderImpl::render_sequence() { - VABufferID seq_param_buf, rc_param_buf, misc_param_tmpbuf, render_id[2]; + VABufferID seq_param_buf, rc_param_buf, render_id[2]; VAStatus va_status; - VAEncMiscParameterBuffer *misc_param, *misc_param_tmp; + VAEncMiscParameterBuffer *misc_param; VAEncMiscParameterRateControl *misc_rate_ctrl; seq_param.level_idc = 41 /*SH_LEVEL_3*/; @@ -1386,31 +1195,17 @@ static int render_sequence(void) render_id[1] = rc_param_buf; render_picture_and_delete(va_dpy, context_id, &render_id[0], 2); - - if (misc_priv_type != 0) { - va_status = vaCreateBuffer(va_dpy, context_id, - VAEncMiscParameterBufferType, - sizeof(VAEncMiscParameterBuffer), - 1, NULL, &misc_param_tmpbuf); - CHECK_VASTATUS(va_status, "vaCreateBuffer"); - vaMapBuffer(va_dpy, misc_param_tmpbuf, (void **)&misc_param_tmp); - misc_param_tmp->type = (VAEncMiscParameterType)misc_priv_type; - misc_param_tmp->data[0] = misc_priv_value; - vaUnmapBuffer(va_dpy, misc_param_tmpbuf); - - render_picture_and_delete(va_dpy, context_id, &misc_param_tmpbuf, 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; @@ -1428,7 +1223,7 @@ static int calc_poc(int pic_order_cnt_lsb) 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; } @@ -1436,42 +1231,31 @@ static int calc_poc(int pic_order_cnt_lsb) return TopFieldOrderCnt; } -static int render_picture(void) +int H264EncoderImpl::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); + 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; - 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; - 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; @@ -1484,7 +1268,7 @@ static int render_picture(void) return 0; } -static int render_packedsequence(void) +int H264EncoderImpl::render_packedsequence() { VAEncPackedHeaderParameterBuffer packedheader_param_buffer; VABufferID packedseq_para_bufid, packedseq_data_bufid, render_id[2]; @@ -1522,7 +1306,7 @@ static int render_packedsequence(void) } -static int render_packedpicture(void) +int H264EncoderImpl::render_packedpicture() { VAEncPackedHeaderParameterBuffer packedheader_param_buffer; VABufferID packedpic_para_bufid, packedpic_data_bufid, render_id[2]; @@ -1558,7 +1342,7 @@ static int render_packedpicture(void) return 0; } -static void render_packedslice() +void H264EncoderImpl::render_packedslice() { VAEncPackedHeaderParameterBuffer packedheader_param_buffer; VABufferID packedslice_para_bufid, packedslice_data_bufid, render_id[2]; @@ -1592,22 +1376,22 @@ static void render_packedslice() free(packedslice_buffer); } -static int render_slice(void) +int H264EncoderImpl::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; 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)); @@ -1615,7 +1399,7 @@ static int render_slice(void) 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; @@ -1635,7 +1419,7 @@ static int render_slice(void) 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 && @@ -1653,23 +1437,20 @@ static int render_slice(void) -int H264Encoder::save_codeddata(storage_task task) +void H264EncoderImpl::save_codeddata(storage_task task) { VACodedBufferSegment *buf_list = NULL; VAStatus va_status; - unsigned int coded_size = 0; string data; - const int64_t global_delay = (ip_period - 1) * (TIMEBASE / frame_rate); // So we never get negative dts. + const int64_t global_delay = (ip_period - 1) * (TIMEBASE / MAX_FPS); // So we never get negative dts. va_status = vaMapBuffer(va_dpy, gl_surfaces[task.display_order % SURFACE_NUM].coded_buf, (void **)(&buf_list)); CHECK_VASTATUS(va_status, "vaMapBuffer"); while (buf_list != NULL) { data.append(reinterpret_cast(buf_list->buf), buf_list->size); buf_list = (VACodedBufferSegment *) buf_list->next; - - frame_size += coded_size; } vaUnmapBuffer(va_dpy, gl_surfaces[task.display_order % SURFACE_NUM].coded_buf); @@ -1690,13 +1471,13 @@ int H264Encoder::save_codeddata(storage_task task) httpd->add_packet(pkt, task.pts + global_delay, task.dts + global_delay); } // Encode and add all audio frames up to and including the pts of this video frame. - // (They can never be queued to us after the video frame they belong to, only before.) for ( ;; ) { int64_t audio_pts; - std::vector audio; + vector audio; { unique_lock lock(frame_queue_mutex); - if (pending_audio_frames.empty()) break; + 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; @@ -1710,7 +1491,11 @@ int H264Encoder::save_codeddata(storage_task task) frame->channel_layout = AV_CH_LAYOUT_STEREO; unique_ptr int_samples(new int32_t[audio.size()]); - avcodec_fill_audio_frame(frame, 2, AV_SAMPLE_FMT_S32, (const uint8_t*)int_samples.get(), audio.size() * sizeof(int32_t), 0); + int ret = avcodec_fill_audio_frame(frame, 2, AV_SAMPLE_FMT_S32, (const uint8_t*)int_samples.get(), audio.size() * sizeof(int32_t), 1); + if (ret < 0) { + fprintf(stderr, "avcodec_fill_audio_frame() failed with %d\n", ret); + exit(1); + } for (int i = 0; i < frame->nb_samples * 2; ++i) { if (audio[i] >= 1.0f) { int_samples[i] = 2147483647; @@ -1734,6 +1519,7 @@ int H264Encoder::save_codeddata(storage_task task) // TODO: Delayed frames. avcodec_free_frame(&frame); av_free_packet(&pkt); + if (audio_pts == task.pts) break; } #if 0 @@ -1753,31 +1539,28 @@ int H264Encoder::save_codeddata(storage_task task) break; } printf("%08lld", encode_order); - printf("(%06d bytes coded)", coded_size); #endif - - return 0; } // this is weird. but it seems to put a new frame onto the queue -void H264Encoder::storage_task_enqueue(storage_task task) +void H264EncoderImpl::storage_task_enqueue(storage_task task) { - std::unique_lock lock(storage_task_queue_mutex); + unique_lock 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(); } -void H264Encoder::storage_task_thread() +void H264EncoderImpl::storage_task_thread() { for ( ;; ) { storage_task current; { // wait until there's an encoded frame - std::unique_lock lock(storage_task_queue_mutex); + unique_lock 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(); } @@ -1790,14 +1573,14 @@ void H264Encoder::storage_task_thread() save_codeddata(move(current)); { - std::unique_lock lock(storage_task_queue_mutex); + unique_lock lock(storage_task_queue_mutex); srcsurface_status[current.display_order % SURFACE_NUM] = SRC_SURFACE_FREE; storage_task_queue_changed.notify_all(); } } } -static int release_encode() +int H264EncoderImpl::release_encode() { int i; @@ -1813,7 +1596,7 @@ static int release_encode() return 0; } -static int deinit_va() +int H264EncoderImpl::deinit_va() { vaTerminate(va_dpy); @@ -1823,28 +1606,7 @@ static int deinit_va() } -static int print_input() -{ - printf("\n\nINPUT:Try to encode H264...\n"); - if (rc_mode != -1) - printf("INPUT: RateControl : %s\n", rc_to_string(rc_mode)); - printf("INPUT: Resolution : %dx%dframes\n", frame_width, frame_height); - printf("INPUT: FrameRate : %d\n", frame_rate); - printf("INPUT: Bitrate : %d\n", frame_bitrate); - printf("INPUT: Slieces : %d\n", frame_slices); - printf("INPUT: IntraPeriod : %d\n", intra_period); - printf("INPUT: IDRPeriod : %d\n", intra_idr_period); - printf("INPUT: IpPeriod : %d\n", ip_period); - printf("INPUT: Initial QP : %d\n", initial_qp); - printf("INPUT: Min QP : %d\n", minimal_qp); - printf("INPUT: Coded Clip : %s\n", coded_fn); - - printf("\n\n"); /* return back to startpoint */ - - return 0; -} - -H264Encoder::H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd) +H264EncoderImpl::H264EncoderImpl(QSurface *surface, int width, int height, HTTPD *httpd) : current_storage_frame(0), surface(surface), httpd(httpd) { AVCodec *codec_audio = avcodec_find_encoder(AUDIO_OUTPUT_CODEC); @@ -1864,10 +1626,8 @@ H264Encoder::H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd) frame_height = height; frame_width_mbaligned = (frame_width + 15) & (~15); frame_height_mbaligned = (frame_height + 15) & (~15); - frame_bitrate = 15000000; // / 60; - current_frame_encoding = 0; - print_input(); + //print_input(); init_va(); setup_encode(); @@ -1879,9 +1639,9 @@ H264Encoder::H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd) 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(&H264EncoderImpl::storage_task_thread, this); - copy_thread = std::thread([this]{ + encode_thread = thread([this]{ //SDL_GL_MakeCurrent(window, context); QOpenGLContext *context = create_context(this->surface); eglBindAPI(EGL_OPENGL_API); @@ -1890,34 +1650,21 @@ H264Encoder::H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd) eglGetError()); exit(1); } - copy_thread_func(); + encode_thread_func(); }); } -H264Encoder::~H264Encoder() +H264EncoderImpl::~H264EncoderImpl() { - { - unique_lock lock(storage_task_queue_mutex); - storage_thread_should_quit = true; - storage_task_queue_changed.notify_all(); - } - { - unique_lock lock(frame_queue_mutex); - copy_thread_should_quit = true; - frame_queue_nonempty.notify_one(); - } - storage_thread.join(); - copy_thread.join(); - - release_encode(); - deinit_va(); + shutdown(); } -bool H264Encoder::begin_frame(GLuint *y_tex, GLuint *cbcr_tex) +bool H264EncoderImpl::begin_frame(GLuint *y_tex, GLuint *cbcr_tex) { + assert(!is_shutdown); { // Wait until this frame slot is done encoding. - std::unique_lock lock(storage_task_queue_mutex); + unique_lock 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; } @@ -1977,106 +1724,195 @@ bool H264Encoder::begin_frame(GLuint *y_tex, GLuint *cbcr_tex) return true; } -void H264Encoder::add_audio(int64_t pts, std::vector audio) +void H264EncoderImpl::add_audio(int64_t pts, vector audio) { + assert(!is_shutdown); { unique_lock lock(frame_queue_mutex); pending_audio_frames[pts] = move(audio); } - frame_queue_nonempty.notify_one(); + frame_queue_nonempty.notify_all(); } - -void H264Encoder::end_frame(RefCountedGLsync fence, int64_t pts, const std::vector &input_frames) +void H264EncoderImpl::end_frame(RefCountedGLsync fence, int64_t pts, const vector &input_frames) { + assert(!is_shutdown); { unique_lock lock(frame_queue_mutex); pending_video_frames[current_storage_frame] = PendingFrame{ fence, input_frames, pts }; ++current_storage_frame; } - frame_queue_nonempty.notify_one(); + frame_queue_nonempty.notify_all(); +} + +void H264EncoderImpl::shutdown() +{ + if (is_shutdown) { + return; + } + + { + unique_lock lock(frame_queue_mutex); + encode_thread_should_quit = true; + frame_queue_nonempty.notify_all(); + } + encode_thread.join(); + { + unique_lock lock(storage_task_queue_mutex); + storage_thread_should_quit = true; + frame_queue_nonempty.notify_all(); + storage_task_queue_changed.notify_all(); + } + storage_thread.join(); + + release_encode(); + deinit_va(); + is_shutdown = true; } -void H264Encoder::copy_thread_func() +void H264EncoderImpl::encode_thread_func() { int64_t last_dts = -1; - for ( ;; ) { + int gop_start_display_frame_num = 0; + 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, display_frame_num; + encoding2display_order(encoding_frame_num, intra_period, intra_idr_period, ip_period, + &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 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(); + 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[display_frame_num]); + pending_video_frames.erase(display_frame_num); } - } 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 / frame_rate); + 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, display_frame_num, gop_start_display_frame_num, frame_type, frame.pts, dts); + } +} + +void H264EncoderImpl::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 H264EncoderImpl::encode_frame(H264EncoderImpl::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(); + } + } else { + //render_sequence(); + render_picture(frame_type, display_frame_num, gop_start_display_frame_num); + } + 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 = display_frame_num; + tmp.frame_type = frame_type; + tmp.pts = pts; + tmp.dts = dts; + storage_task_enqueue(move(tmp)); + + update_ReferenceFrames(frame_type); +} + +// Proxy object. +H264Encoder::H264Encoder(QSurface *surface, int width, int height, HTTPD *httpd) + : impl(new H264EncoderImpl(surface, width, height, httpd)) {} + +// Must be defined here because unique_ptr<> destructor needs to know the impl. +H264Encoder::~H264Encoder() {} + +void H264Encoder::add_audio(int64_t pts, vector audio) +{ + impl->add_audio(pts, audio); +} + +bool H264Encoder::begin_frame(GLuint *y_tex, GLuint *cbcr_tex) +{ + return impl->begin_frame(y_tex, cbcr_tex); +} + +void H264Encoder::end_frame(RefCountedGLsync fence, int64_t pts, const vector &input_frames) +{ + impl->end_frame(fence, pts, input_frames); +} + +void H264Encoder::shutdown() +{ + impl->shutdown(); +} + +// Real class.