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

avcodec/libx264: Simplify copying packet data

Browse Source 
x264.h: "the payloads of all output NALs are guaranteed to be
sequential in memory." Therefore we can omit the loop.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-11-07 15:18:41 +01:00
parent 19ed9236db
commit b59138b681
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/libx264.c
View File

@@ -139,7 +139,6 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt,
X264Context *x4 = ctx->priv_data; X264Context *x4 = ctx->priv_data;
uint8_t *p; uint8_t *p;
uint64_t size = x4->sei_size; uint64_t size = x4->sei_size;
int i;
int ret; int ret;
if (!nnal) if (!nnal)
@@ -165,14 +164,14 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt,
if (x4->sei_size > 0) { if (x4->sei_size > 0) {
memcpy(p, x4->sei, x4->sei_size); memcpy(p, x4->sei, x4->sei_size);
p += x4->sei_size; p += x4->sei_size;
size -= x4->sei_size;
x4->sei_size = 0; x4->sei_size = 0;
av_freep(&x4->sei); av_freep(&x4->sei);
} }
for (i = 0; i < nnal; i++){ /* x264 guarantees the payloads of the NALs
memcpy(p, nals[i].p_payload, nals[i].i_payload); * to be sequential in memory. */
p += nals[i].i_payload; memcpy(p, nals[0].p_payload, size);
}
return 1; return 1;
} }