encx264Close
};
-// 16 is probably overkill but it's also the maximum for h.264 reference frames
-#define MAX_INFLIGHT_FRAMES 16
+#define DTS_BUFFER_SIZE 32
struct hb_work_private_s
{
x264_picture_t pic_in;
// Internal queue of DTS start/stop values.
- int64_t dts_start[MAX_INFLIGHT_FRAMES];
- int64_t dts_stop[MAX_INFLIGHT_FRAMES];
+ int64_t dts_start[DTS_BUFFER_SIZE];
+ int64_t dts_stop[DTS_BUFFER_SIZE];
int64_t dts_write_index;
int64_t dts_read_index;
+ int64_t next_chap;
char filename[1024];
};
param.i_height = job->height;
param.i_fps_num = job->vrate;
param.i_fps_den = job->vrate_base;
- param.i_keyint_max = 20 * job->vrate / job->vrate_base;
+
+ if (job->vrate_base != 1080000)
+ {
+ /* If the fps isn't 25, adjust the key intervals. Add 1 because
+ we want 24, not 23 with a truncated remainder. */
+ param.i_keyint_min = (job->vrate / job->vrate_base) + 1;
+ param.i_keyint_max = (10 * job->vrate / job->vrate_base) + 1;
+ hb_log("encx264: keyint-min: %i, keyint-max: %i", param.i_keyint_min, param.i_keyint_max);
+ }
+
param.i_log_level = X264_LOG_INFO;
if( job->h264_level )
{
Merritt implemented in the Mplayer/Mencoder project.
*/
- char *x264opts = job->x264opts;
- if( x264opts != NULL && *x264opts != '\0' )
+ if( job->x264opts != NULL && *job->x264opts != '\0' )
{
- while( *x264opts )
+ char *x264opts, *x264opts_start;
+
+ x264opts = x264opts_start = strdup(job->x264opts);
+
+ while( x264opts_start && *x264opts )
{
char *name = x264opts;
char *value;
if( ret == X264_PARAM_BAD_VALUE )
hb_log( "x264 options: Bad argument %s=%s", name, value ? value : "(null)" );
}
+ free(x264opts_start);
}
pv->dts_write_index = 0;
pv->dts_read_index = 0;
+ pv->next_chap = 0;
return 0;
}
job->height / 4, job->width * job->height / 4 );
}
- pv->pic_in.i_type = X264_TYPE_AUTO;
+ if( in->new_chap && job->chapter_markers )
+ {
+ /* chapters have to start with an IDR frame so request that this
+ frame be coded as IDR. Since there may be up to 16 frames
+ currently buffered in the encoder remember the timestamp so
+ when this frame finally pops out of the encoder we'll mark
+ its buffer as the start of a chapter. */
+ pv->pic_in.i_type = X264_TYPE_IDR;
+ if( pv->next_chap == 0 )
+ {
+ pv->next_chap = in->start;
+ }
+ /* don't let 'work_loop' put a chapter mark on the wrong buffer */
+ in->new_chap = 0;
+ }
+ else
+ {
+ pv->pic_in.i_type = X264_TYPE_AUTO;
+ }
pv->pic_in.i_qpplus1 = 0;
// Remember current PTS value, use as DTS later
- pv->dts_start[pv->dts_write_index & (MAX_INFLIGHT_FRAMES-1)] = in->start;
- pv->dts_stop[pv->dts_write_index & (MAX_INFLIGHT_FRAMES-1)] = in->stop;
+ pv->dts_start[pv->dts_write_index & (DTS_BUFFER_SIZE-1)] = in->start;
+ pv->dts_stop[pv->dts_write_index & (DTS_BUFFER_SIZE-1)] = in->stop;
pv->dts_write_index++;
/* Feed the input DTS to x264 so it can figure out proper output PTS */
buf->size = 0;
buf->start = in->start;
buf->stop = in->stop;
- buf->key = 0;
+ buf->frametype = 0;
int64_t dts_start, dts_stop;
/* Get next DTS value to use */
- dts_start = pv->dts_start[pv->dts_read_index & (MAX_INFLIGHT_FRAMES-1)];
- dts_stop = pv->dts_stop[pv->dts_read_index & (MAX_INFLIGHT_FRAMES-1)];
+ dts_start = pv->dts_start[pv->dts_read_index & (DTS_BUFFER_SIZE-1)];
+ dts_stop = pv->dts_stop[pv->dts_read_index & (DTS_BUFFER_SIZE-1)];
pv->dts_read_index++;
for( i = 0; i < i_nal; i++ )
{
if( nal[i].i_ref_idc == NAL_PRIORITY_HIGHEST )
{
- buf->key = 1;
+ buf->frametype = HB_FRAME_KEY;
}
buf->size += size;
continue;
buf->data[buf->size+3] = ( ( size - 4 ) >> 0 ) & 0xFF;
switch( pic_out.i_type )
{
- /* For IDR (key frames), buf->key = 1,
- and the same for regular I-frames. */
+ /* Decide what type of frame we have. */
case X264_TYPE_IDR:
+ buf->frametype = HB_FRAME_IDR;
+ /* if we have a chapter marker pending and this
+ frame's presentation time stamp is at or after
+ the marker's time stamp, use this as the
+ chapter start. */
+ if( pv->next_chap != 0 && pv->next_chap <= pic_out.i_pts )
+ {
+ pv->next_chap = 0;
+ buf->new_chap = 1;
+ }
+ break;
case X264_TYPE_I:
- buf->key = 1;
+ buf->frametype = HB_FRAME_I;
+ break;
+ case X264_TYPE_P:
+ buf->frametype = HB_FRAME_P;
break;
- /* For B-frames, buf->key = 2 */
case X264_TYPE_B:
- buf->key = 2;
+ buf->frametype = HB_FRAME_B;
break;
/* This is for b-pyramid, which has reference b-frames
- However, it doesn't seem to ever be used...
- They just show up as buf->key == 2 like
- regular b-frames. */
+ However, it doesn't seem to ever be used... */
case X264_TYPE_BREF:
- buf->key = 3;
+ buf->frametype = HB_FRAME_BREF;
break;
- /* For P-frames, buf->key = 0 */
+ /* If it isn't the above, what type of frame is it?? */
default:
- buf->key = 0;
+ buf->frametype = 0;
}
OSDN Git Service
