From 4c2a49285e5dc470642daef8e469d0d37e43319b Mon Sep 17 00:00:00 2001 From: jp9000 Date: Mon, 14 Nov 2016 17:43:37 -0800 Subject: [PATCH] Revert "libobs: Ensure AVC priority is always highest for keyframes" This reverts commit 66525632a05e125c56860971046fbb5b8247d74e. --- libobs/obs-avc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libobs/obs-avc.c b/libobs/obs-avc.c index da08b64a8..647427ac8 100644 --- a/libobs/obs-avc.c +++ b/libobs/obs-avc.c @@ -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, @@ -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)