Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Allocate AVPacket for stream->pending

Browse source 
From FFmpeg/doc/APIchanges:

    2021-03-17 - f7db77bd87 - lavc 58.133.100 - codec.h
      Deprecated av_init_packet(). Once removed, sizeof(AVPacket) will
      no longer be a part of the public ABI.

Remove the has_pending boolean, which can be replaced by:

    stream->pending != NULL

Refs #2302 <https://github.com/Genymobile/scrcpy/issues/2302>
This commit is contained in:
Romain Vimont 2021-06-14 09:07:49 +02:00
parent a5d71eee45
commit e8b053ad2f
2 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
app/src/stream.c
View file

@ -104,33 +104,38 @@ static bool
stream_push_packet(struct stream *stream, AVPacket *packet) { stream_push_packet(struct stream *stream, AVPacket *packet) {
bool is_config = packet->pts == AV_NOPTS_VALUE; bool is_config = packet->pts == AV_NOPTS_VALUE;
// A config packet must not be decoded immetiately (it contains no // A config packet must not be decoded immediately (it contains no
// frame); instead, it must be concatenated with the future data packet. // frame); instead, it must be concatenated with the future data packet.
if (stream->has_pending || is_config) { if (stream->pending || is_config) {
size_t offset; size_t offset;
if (stream->has_pending) { if (stream->pending) {
offset = stream->pending.size; offset = stream->pending->size;
if (av_grow_packet(&stream->pending, packet->size)) { if (av_grow_packet(stream->pending, packet->size)) {
LOGE("Could not grow packet"); LOGE("Could not grow packet");
return false; return false;
} }
} else { } else {
offset = 0; offset = 0;
if (av_new_packet(&stream->pending, packet->size)) { stream->pending = av_packet_alloc();
LOGE("Could not create packet"); if (!stream->pending) {
LOGE("Could not allocate packet");
return false;
}
if (av_new_packet(stream->pending, packet->size)) {
LOGE("Could not create packet");
av_packet_free(&stream->pending);
return false; return false;
} }
stream->has_pending = true;
} }
memcpy(stream->pending.data + offset, packet->data, packet->size); memcpy(stream->pending->data + offset, packet->data, packet->size);
if (!is_config) { if (!is_config) {
// prepare the concat packet to send to the decoder // prepare the concat packet to send to the decoder
stream->pending.pts = packet->pts; stream->pending->pts = packet->pts;
stream->pending.dts = packet->dts; stream->pending->dts = packet->dts;
stream->pending.flags = packet->flags; stream->pending->flags = packet->flags;
packet = &stream->pending; packet = stream->pending;
} }
} }
@ -144,10 +149,10 @@ stream_push_packet(struct stream *stream, AVPacket *packet) {
// data packet // data packet
bool ok = stream_parse(stream, packet); bool ok = stream_parse(stream, packet);
if (stream->has_pending) { if (stream->pending) {
// the pending packet must be discarded (consumed or error) // the pending packet must be discarded (consumed or error)
stream->has_pending = false; av_packet_unref(stream->pending);
av_packet_unref(&stream->pending); av_packet_free(&stream->pending);
} }
if (!ok) { if (!ok) {
@ -233,8 +238,9 @@ run_stream(void *data) {
LOGD("End of frames"); LOGD("End of frames");
if (stream->has_pending) { if (stream->pending) {
av_packet_unref(&stream->pending); av_packet_unref(stream->pending);
av_packet_free(&stream->pending);
} }
av_parser_close(stream->parser); av_parser_close(stream->parser);
@ -252,7 +258,7 @@ void
stream_init(struct stream *stream, socket_t socket, stream_init(struct stream *stream, socket_t socket,
const struct stream_callbacks *cbs, void *cbs_userdata) { const struct stream_callbacks *cbs, void *cbs_userdata) {
stream->socket = socket; stream->socket = socket;
stream->has_pending = false; stream->pending = NULL;
stream->sink_count = 0; stream->sink_count = 0;
assert(cbs && cbs->on_eos); assert(cbs && cbs->on_eos);

3
app/src/stream.h
View file

@ -24,8 +24,7 @@ struct stream {
AVCodecParserContext *parser; AVCodecParserContext *parser;
// successive packets may need to be concatenated, until a non-config // successive packets may need to be concatenated, until a non-config
// packet is available // packet is available
bool has_pending; AVPacket *pending;
AVPacket pending;
const struct stream_callbacks *cbs; const struct stream_callbacks *cbs;
void *cbs_userdata; void *cbs_userdata;