virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

Improve error return values.

Browse Source 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26129 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Anssi Hannula 2010-12-29 16:42:14 +00:00 committed by Carl Eugen Hoyos
parent 977903521e
commit a4c8e0a82b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/spdifenc.c
View File

@ -139,7 +139,7 @@ static int spdif_header_dts(AVFormatContext *s, AVPacket *pkt)
break; break;
default: default:
av_log(s, AV_LOG_ERROR, "bad DTS syncword 0x%x\n", syncword_dts); av_log(s, AV_LOG_ERROR, "bad DTS syncword 0x%x\n", syncword_dts);
return -1; return AVERROR_INVALIDDATA;
} }
blocks++; blocks++;
switch (blocks) { switch (blocks) {
@ -149,7 +149,7 @@ static int spdif_header_dts(AVFormatContext *s, AVPacket *pkt)
default: default:
av_log(s, AV_LOG_ERROR, "%i samples in DTS frame not supported\n", av_log(s, AV_LOG_ERROR, "%i samples in DTS frame not supported\n",
blocks << 5); blocks << 5);
return -1; return AVERROR(ENOSYS);
} }
ctx->pkt_offset = blocks << 7; ctx->pkt_offset = blocks << 7;
@ -171,7 +171,7 @@ static int spdif_header_mpeg(AVFormatContext *s, AVPacket *pkt)
if (layer == 3 || version == 1) { if (layer == 3 || version == 1) {
av_log(s, AV_LOG_ERROR, "Wrong MPEG file format\n"); av_log(s, AV_LOG_ERROR, "Wrong MPEG file format\n");
return -1; return AVERROR_INVALIDDATA;
} }
av_log(s, AV_LOG_DEBUG, "version: %i layer: %i extension: %i\n", version, layer, extension); av_log(s, AV_LOG_DEBUG, "version: %i layer: %i extension: %i\n", version, layer, extension);
if (version == 2 && extension) { if (version == 2 && extension) {
@ -196,7 +196,7 @@ static int spdif_header_aac(AVFormatContext *s, AVPacket *pkt)
ret = ff_aac_parse_header(&gbc, &hdr); ret = ff_aac_parse_header(&gbc, &hdr);
if (ret < 0) { if (ret < 0) {
av_log(s, AV_LOG_ERROR, "Wrong AAC file format\n"); av_log(s, AV_LOG_ERROR, "Wrong AAC file format\n");
return -1; return AVERROR_INVALIDDATA;
} }
ctx->pkt_offset = hdr.samples << 2; ctx->pkt_offset = hdr.samples << 2;
@ -213,7 +213,7 @@ static int spdif_header_aac(AVFormatContext *s, AVPacket *pkt)
default: default:
av_log(s, AV_LOG_ERROR, "%i samples in AAC frame not supported\n", av_log(s, AV_LOG_ERROR, "%i samples in AAC frame not supported\n",
hdr.samples); hdr.samples);
return -1; return AVERROR(EINVAL);
} }
//TODO Data type dependent info (LC profile/SBR) //TODO Data type dependent info (LC profile/SBR)
return 0; return 0;
@ -256,7 +256,7 @@ static int spdif_header_truehd(AVFormatContext *s, AVPacket *pkt)
* distribute the TrueHD frames in the MAT frame */ * distribute the TrueHD frames in the MAT frame */
av_log(s, AV_LOG_ERROR, "TrueHD frame too big, %d bytes\n", pkt->size); av_log(s, AV_LOG_ERROR, "TrueHD frame too big, %d bytes\n", pkt->size);
av_log_ask_for_sample(s, NULL); av_log_ask_for_sample(s, NULL);
return -1; return AVERROR_INVALIDDATA;
} }
memcpy(&ctx->hd_buf[ctx->hd_buf_count * TRUEHD_FRAME_OFFSET - BURST_HEADER_SIZE + mat_code_length], memcpy(&ctx->hd_buf[ctx->hd_buf_count * TRUEHD_FRAME_OFFSET - BURST_HEADER_SIZE + mat_code_length],
@ -309,7 +309,7 @@ static int spdif_write_header(AVFormatContext *s)
break; break;
default: default:
av_log(s, AV_LOG_ERROR, "codec not supported\n"); av_log(s, AV_LOG_ERROR, "codec not supported\n");
return -1; return AVERROR_PATCHWELCOME;
} }
return 0; return 0;
} }
@ -334,14 +334,14 @@ static int spdif_write_packet(struct AVFormatContext *s, AVPacket *pkt)
ret = ctx->header_info(s, pkt); ret = ctx->header_info(s, pkt);
if (ret < 0) if (ret < 0)
return -1; return ret;
if (!ctx->pkt_offset) if (!ctx->pkt_offset)
return 0; return 0;
padding = (ctx->pkt_offset - BURST_HEADER_SIZE - ctx->out_bytes) >> 1; padding = (ctx->pkt_offset - BURST_HEADER_SIZE - ctx->out_bytes) >> 1;
if (padding < 0) { if (padding < 0) {
av_log(s, AV_LOG_ERROR, "bitrate is too high\n"); av_log(s, AV_LOG_ERROR, "bitrate is too high\n");
return -1; return AVERROR(EINVAL);
} }
put_le16(s->pb, SYNCWORD1); //Pa put_le16(s->pb, SYNCWORD1); //Pa