Skip to content

Commit

Permalink
Revert "libobs: Ensure AVC priority is always highest for keyframes"
Browse files Browse the repository at this point in the history
This reverts commit 6652563.
  • Loading branch information
jp9000 committed Nov 15, 2016
1 parent edfc2be commit 4c2a492
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions libobs/obs-avc.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ const uint8_t *obs_avc_find_startcode(const uint8_t *p, const uint8_t *end)
return out;
}

static inline void set_drop_priority(struct encoder_packet *p)
static inline int get_drop_priority(int priority)
{
p->drop_priority = p->keyframe ? OBS_NAL_PRIORITY_HIGHEST : p->priority;
return priority;
}

static void serialize_avc_data(struct serializer *s, const uint8_t *data,
Expand Down Expand Up @@ -141,8 +141,7 @@ void obs_parse_avc_packet(struct encoder_packet *avc_packet,

avc_packet->data = output.bytes.array;
avc_packet->size = output.bytes.num;

set_drop_priority(avc_packet);
avc_packet->drop_priority = get_drop_priority(avc_packet->priority);
}

static inline bool has_start_code(const uint8_t *data)
Expand Down

0 comments on commit 4c2a492

Please sign in to comment.