highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/target_bsf_fuzzer: simplify the loop feeding packets to the filter

Browse Source 
And use a single AVPacket for the entire process.
This more closely follows the suggested API usage in the doxy.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2022-02-23 21:38:30 -03:00
parent 7a4840a8ca
commit 4f21a9ae6b
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tools/target_bsf_fuzzer.c
View File

@ -43,7 +43,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
const uint8_t *last = data; const uint8_t *last = data;
const uint8_t *end = data + size; const uint8_t *end = data + size;
AVBSFContext *bsf = NULL; AVBSFContext *bsf = NULL;
AVPacket *in, *out; AVPacket *pkt;
uint64_t keyframes = 0; uint64_t keyframes = 0;
uint64_t flushpattern = -1; uint64_t flushpattern = -1;
int res; int res;
@ -118,9 +118,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
return 0; // Failure of av_bsf_init() does not imply that a issue was found return 0; // Failure of av_bsf_init() does not imply that a issue was found
} }
in = av_packet_alloc(); pkt = av_packet_alloc();
out = av_packet_alloc(); if (!pkt)
if (!in || !out)
error("Failed memory allocation"); error("Failed memory allocation");
while (data < end) { while (data < end) {
@ -133,11 +132,11 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
if (data + sizeof(fuzz_tag) > end) if (data + sizeof(fuzz_tag) > end)
data = end; data = end;
res = av_new_packet(in, data - last); res = av_new_packet(pkt, data - last);
if (res < 0) if (res < 0)
error("Failed memory allocation"); error("Failed memory allocation");
memcpy(in->data, last, data - last); memcpy(pkt->data, last, data - last);
in->flags = (keyframes & 1) * AV_PKT_FLAG_DISCARD + (!!(keyframes & 2)) * AV_PKT_FLAG_KEY; pkt->flags = (keyframes & 1) * AV_PKT_FLAG_DISCARD + (!!(keyframes & 2)) * AV_PKT_FLAG_KEY;
keyframes = (keyframes >> 2) + (keyframes<<62); keyframes = (keyframes >> 2) + (keyframes<<62);
data += sizeof(fuzz_tag); data += sizeof(fuzz_tag);
last = data; last = data;
@ -146,28 +145,20 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
av_bsf_flush(bsf); av_bsf_flush(bsf);
flushpattern = (flushpattern >> 3) + (flushpattern << 61); flushpattern = (flushpattern >> 3) + (flushpattern << 61);
while (in->size) { res = av_bsf_send_packet(bsf, pkt);
res = av_bsf_send_packet(bsf, in); if (res < 0) {
if (res < 0 && res != AVERROR(EAGAIN)) av_packet_unref(pkt);
break; continue;
res = av_bsf_receive_packet(bsf, out);
if (res < 0)
break;
av_packet_unref(out);
} }
av_packet_unref(in); while (av_bsf_receive_packet(bsf, pkt) >= 0)
av_packet_unref(pkt);
} }
res = av_bsf_send_packet(bsf, NULL); av_bsf_send_packet(bsf, NULL);
while (!res) { while (av_bsf_receive_packet(bsf, pkt) >= 0)
res = av_bsf_receive_packet(bsf, out); av_packet_unref(pkt);
if (res < 0)
break;
av_packet_unref(out);
}
av_packet_free(&in); av_packet_free(&pkt);
av_packet_free(&out);
av_bsf_free(&bsf); av_bsf_free(&bsf);
return 0; return 0;
} }