Skip to content

V
vlc
Commit 2abf305a authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

x265: initialize picture and set picture type

parent 229e2709
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 0 deletions
modules/codec/x265.c
View file @ 2abf305a
...@@ -70,6 +70,8 @@ static block_t *Encode(encoder_t *p_enc, picture_t *p_pict) ...@@ -70,6 +70,8 @@ static block_t *Encode(encoder_t *p_enc, picture_t *p_pict)
encoder_sys_t *p_sys = p_enc->p_sys; encoder_sys_t *p_sys = p_enc->p_sys;
x265_picture_t pic; x265_picture_t pic;
x265_picture_init(&p_sys->param, &pic);
if (likely(p_pict)) { if (likely(p_pict)) {
if (unlikely(p_sys->initial_date == 0)) { if (unlikely(p_sys->initial_date == 0)) {
p_sys->initial_date = p_pict->date; p_sys->initial_date = p_pict->date;
...@@ -120,6 +122,19 @@ static block_t *Encode(encoder_t *p_enc, picture_t *p_pict) ...@@ -120,6 +122,19 @@ static block_t *Encode(encoder_t *p_enc, picture_t *p_pict)
p_block->i_pts = p_sys->initial_date + pic.poc * p_block->i_length; p_block->i_pts = p_sys->initial_date + pic.poc * p_block->i_length;
p_block->i_dts = p_sys->initial_date + p_sys->dts++ * p_block->i_length; p_block->i_dts = p_sys->initial_date + p_sys->dts++ * p_block->i_length;
switch (pic.sliceType)
{
case X265_TYPE_I:
p_block->i_flags |= BLOCK_FLAG_TYPE_I;
break;
case X265_TYPE_P:
p_block->i_flags |= BLOCK_FLAG_TYPE_P;
break;
case X265_TYPE_B:
p_block->i_flags |= BLOCK_FLAG_TYPE_B;
break;
}
#ifndef NDEBUG #ifndef NDEBUG
msg_Dbg(p_enc, "%zu bytes (frame %"PRId64", %.2ffps)", p_block->i_buffer, msg_Dbg(p_enc, "%zu bytes (frame %"PRId64", %.2ffps)", p_block->i_buffer,
p_sys->dts, (float)p_sys->dts * CLOCK_FREQ / (mdate() - p_sys->start)); p_sys->dts, (float)p_sys->dts * CLOCK_FREQ / (mdate() - p_sys->start));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment