MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-24 03:27:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

[-] Lots of housekeeping thanks to scan-build and input from @acmay

Browse Source
This commit is contained in:
ejurgensen
2016-11-19 23:08:50 +01:00
parent 8525c278ec
commit bdd6bab982
21 changed files with 159 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/transcode.c
View File

@@ -922,7 +922,6 @@ open_filter(struct filter_ctx *filter_ctx, AVCodecContext *dec_ctx, AVCodecConte
if (!buffersrc || !buffersink)
{
DPRINTF(E_LOG, L_XCODE, "Filtering source or sink element not found\n");
ret = AVERROR_UNKNOWN;
goto out_fail;
}
@@ -1339,6 +1338,7 @@ transcode_decode_setup_raw(void)
if (!ctx->ifmt_ctx)
{
DPRINTF(E_LOG, L_XCODE, "Out of memory for decode format ctx\n");
free(ctx);
return NULL;
}
@@ -1348,6 +1348,8 @@ transcode_decode_setup_raw(void)
if (!ctx->audio_stream)
{
DPRINTF(E_LOG, L_XCODE, "Could not create stream with PCM16 decoder\n");
avformat_free_context(ctx->ifmt_ctx);
free(ctx);
return NULL;
}
@@ -1524,7 +1526,6 @@ transcode_decode(struct decoded_frame **decoded, struct decode_ctx *ctx)
// with empty input until no more frames are returned
DPRINTF(E_DBG, L_XCODE, "Could not read packet, will flush decoders\n");
used = 1;
got_frame = flush_decoder(frame, &in_stream, &stream_index, ctx);
if (got_frame)
break;
@@ -1573,19 +1574,22 @@ transcode_decode(struct decoded_frame **decoded, struct decode_ctx *ctx)
}
while (!got_frame);
// Return the decoded frame and stream index
*decoded = malloc(sizeof(struct decoded_frame));
if (!*decoded)
if (got_frame > 0)
{
DPRINTF(E_LOG, L_XCODE, "Out of memory for decoded result\n");
// Return the decoded frame and stream index
*decoded = malloc(sizeof(struct decoded_frame));
if (!(*decoded))
{
DPRINTF(E_LOG, L_XCODE, "Out of memory for decoded result\n");
av_frame_free(&frame);
return -1;
av_frame_free(&frame);
return -1;
}
(*decoded)->frame = frame;
(*decoded)->stream_index = stream_index;
}
(*decoded)->frame = frame;
(*decoded)->stream_index = stream_index;
return got_frame;
}
@@ -1659,10 +1663,17 @@ transcode_raw2frame(uint8_t *data, size_t size)
int ret;
decoded = malloc(sizeof(struct decoded_frame));
frame = av_frame_alloc();
if (!decoded || !frame)
if (!decoded)
{
DPRINTF(E_LOG, L_XCODE, "Out of memory for decoded struct or frame\n");
DPRINTF(E_LOG, L_XCODE, "Out of memory for decoded struct\n");
return NULL;
}
frame = av_frame_alloc();
if (!frame)
{
DPRINTF(E_LOG, L_XCODE, "Out of memory for frame\n");
free(decoded);
return NULL;
}
@@ -1682,6 +1693,7 @@ transcode_raw2frame(uint8_t *data, size_t size)
if (ret < 0)
{
DPRINTF(E_LOG, L_XCODE, "Error filling frame with rawbuf: %s\n", err2str(ret));
transcode_decoded_free(decoded);
return NULL;
}