Skip to content

Initial work on h264 chunked mode (decoding before getting full frame) #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Initial work on h264 chunked mode (decoding before getting full frame) #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c54714e
h264f: clear next_uref of nal offsets
funman Jan 11, 2019
59c5877
avcdec: only store uref when needed
funman Jan 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions lib/upipe-av/upipe_avcodec_decode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,6 +1116,8 @@ static void upipe_avcdec_output_pic(struct upipe *upipe, struct upump **upump_p)
}
}

uref_free(upipe_avcdec->uref);
upipe_avcdec->uref = NULL;
upipe_avcdec_output(upipe, uref, upump_p);
}

Expand Down Expand Up @@ -1198,6 +1200,8 @@ static void upipe_avcdec_output_sound(struct upipe *upipe,
}
}

uref_free(upipe_avcdec->uref);
upipe_avcdec->uref = NULL;
upipe_avcdec_output(upipe, uref, upump_p);
}

Expand Down Expand Up @@ -1291,7 +1295,6 @@ static void upipe_avcdec_store_uref(struct upipe *upipe, struct uref *uref)
struct upipe_avcdec *upipe_avcdec = upipe_avcdec_from_upipe(upipe);
if (upipe_avcdec->uref != NULL && upipe_avcdec->uref->uchain.next != NULL)
uref_free(uref_from_uchain(upipe_avcdec->uref->uchain.next));
uref_free(upipe_avcdec->uref);
upipe_avcdec->uref = uref;
}

Expand Down Expand Up @@ -1348,7 +1351,10 @@ static bool upipe_avcdec_decode(struct upipe *upipe, struct uref *uref,
upipe_avcdec->input_dts_sys = input_dts_sys;
}

upipe_avcdec_store_uref(upipe, uref);
if (!upipe_avcdec->uref)
upipe_avcdec_store_uref(upipe, uref);
else
uref_free(uref);
upipe_avcdec_decode_avpkt(upipe, &avpkt, upump_p);

free(avpkt.data);
Expand Down
3 changes: 3 additions & 0 deletions lib/upipe-framers/upipe_h264_framer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2028,6 +2028,9 @@ static void upipe_h264f_output_au(struct upipe *upipe, struct uref *uref,
upipe_throw_error(upipe, err);
}

if (upipe_h264f->next_uref)
uref_h26x_delete_nal_offsets(upipe_h264f->next_uref);

upipe_h264f_output(upipe, uref, upump_p);
}

Expand Down